Back out cset 477e7d2eb1d7 (bug 965593) for causing bug 975221 which is more severe. r=backout