Just extract vaping from tobacco legislation. The two should never have been associated. I'm sure Mr. Hunter and Congress may understand this simple fact as clearly as we do.
Folks like @Mooch and @Dampmaskin have done more for vaping battery safety (safe use) and dissemination of what info's needed by us for this purpose than a thousand pencil pushers at the FDA. Had gov spawned as many pages of regulations on what a proper battery should be, we'd still be trusting them first and last. Label, or no.
Changes are good, whoever might do the regulatory spinning, that they'd continue to conflate things real good to our disadvantage (like now, batt's and other hardware).
We can encourage and support our own knowledgable efforts or we can let the bureaucrats forever wave those sticky fingers at us. Someone's always going to find something wrong with what we're doing. And you can be just as certain they'll have a rule ready for it.
The choice is yours. Until they take it from you.