reverting #28802