Clean up from the overly aggressive commit