Revert the part of 75177 that split ConstantRange into two classes, and