Backed out changesets 5ec98e8b1be9 and 0f67033f26f0 (bug 877437) for jit-test bustage.