Remove drawball for real this time and fix an accidental regression.