Back out 60748 for now. It's breaking SPASS, 254.gap, and 464.h264ref.