This reverts commit a8c8b627. It causes intermittent Clang :: SemaObjC/parameterized_classes_subst.m test failures on various bots.