We can put this back and remove the else-if/else that was added.