Back out bug 1000875 in order to fix the regression tracked in bug 1011166. a=backout