Backed out changeset 638b67508a3e (bug 951827) for causing bug 975820.