Backed out the change to remove cleanup on short-circuit exit