Improper disabling of cleanup. Accidental check-in.