Forgot to set the switch to use the new C++ functions by default