bug 804605 - backout 766973 767158 785050 r=backout a=akeybl

--HG--
extra : rebase_source : ddcecda9877208372f23ebeb081a6443a72adc17