Remove extra-cmake hack

The propper solution is now upstream