Backed out changeset c52934a52f94 (bug 925397) for jit/scatter test failures