Fix backToNormal to work on jobs with concurrent builds, increment version