Revert "Some minor cleaning up of our CMake files [ci skip]."

This reverts commit 8e76fec7c484d6928175c442d90a4fcf13df80d2.