CMake: Revert r79144. It reverted a change necessary for correct