Backout 897559 (Request by RyanVM due to bustage)