cmake: Backed out changeset 9009d85d3762 This is being replaced by a different patch (see Bugzilla #4970).