Backout bug 924702 for test failures.

--HG--
extra : transplant_source : %29%D1%A0%88%92%88%87%A3%21%8A%A1%90%F5%DFD%10%CE%DD%13%C3