Revert "CMake Update"

This reverts commit f77b4f1ebb5de5cb38096374829e1a8b8cffd8e6.