bad merge in commit d4863d3, lost CERTIFIED_USER string constant