Backed out changeset a8808a02a661 (bug 880625) for PSL test failure