Backed out changeset 8192e8b529d2 (bug 939700) for test failures.