Back out cset af0e7fea51b9 (bug 965593) for causing bug 975221 which is more severe. r=backout a=jsmith