Merge "Revert "Try really hard for JIT in test 916""