Reverting 222792