The issue with CMake 3.1.0 is actually something else. Back the change out for now while a proper fix is being worked on.