Backed out changeset 199bffb1f6fb (bug 877072) for test failures