Another cleanup
Partial revert of "CMake: Remove cmake module"

This reverts commit 63188667bbe81eab1fed20df03965bd8ceb16612.