This reverts commit 0e3cfc13. Due to VS 2015 RTM being released, additional changes are needed to CMake 3.3.