Bring back old leave handler