Roll r94484 (avoiding RTTI problems in tests) forward again in a way that isn't