These changes go beyond the scope of #10734 and I don't think there are
worth taking the risk of degrading phrasing that have been tested with
users.