Backing out bug 893276 for causing bug 1058840. a=lmandel

--HG--
extra : transplant_source : %80%26%C0%9A%D2%1AdQ%DE%CDX%ACS%9A%10%D8%A6%B2%DEn