Back out bug 1045895 for causing bug 1070759.