Revert commits r190613, r190560 and r190557.

The added a cmake invocation to null builds, making them a lot slower.