Back out bug 1008301 for causing bug 1021564 and bug 1025914. a=backout

--HG--
extra : rebase_source : d50bb1ece8f5fde569902ad0d858c59ed3281acf