Revert topic 'preserve_cmake_minimum_required_version'

This change exposed a bug in the CMP0022 NEW behavior.  That will
need to be fixed before this change can be made cleanly.
Merge topic 'preserve_cmake_minimum_required_version' into next

200cda56 Revert topic 'preserve_cmake_minimum_required_version'