Backed out changeset 8450d74f782e (bug 1000305) for j1 test failures