This can be put back as well, and the else-if/else that was added can be removed.