Merge "Stop preloading a class I'm about to remove."