I did that initially then I thought it would be better to have the atomic `_update_error_messages` which only deals with #20199. I don't mind changing it back though.