Merge "Revert recent JIT code cache changes"