Cleanup for a re-push.