Block r61438 from forward porting sinc it's a classic-classes fix.