This *should* fix the build on non-Linux systems like MacOS X.
This allows us to drop our config mode patch.