Backed out changeset 5ed0d1e11971 (bug 1000428)
Backed out changeset 06a1ebb05c63 (bug 1000428) for causing regressions