Back out last cmake change.