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