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