Back out bug 1021248 for causing bug 1028271. r=backout