Merge "Revert^2 "Refactor code around JIT creation.""