Temporarily (?) revert ffdba45b4bbd because of massive perf drop in GT, working around #5900

Not sure what to do about the Chinese Tactics Ogre though...