Revert "Clean up the CC version check a bit."

This reverts commit d09c18e63c0bda140f249b15d7a29021e93138e0.