Backed out changeset 0e34a26a4353 (bug 924972) because of more test failures