No. Read my lips. Congress has the power to legislate anything that "substantially affects" their ability to regulate interstate commerce, provided that the legislation is both necessary and proper.
And in order for them to regulate interstate commerce, it will automatically become "necessary and proper" to legislate anything that might affect their ability to do that. Nice. The "necessary and proper" test is appied to the act of enforcing the regulation, and removed from the regulation itself.