Revert few changes that broke the cmake build in travis