Reverting dc20e866 and ba09d205

The bug was actually already fixed and moreover this could cause that fireCompleted won't be called in case that cleanUp throws an exception, see commentes under https://github.com/jenkinsci/jenkins/commit/51f715162eba4dd1c4e081ec15c7ceb12e813ca5