Reverting change 49889