cmake changes that got lost during some reverts