Merge "Revert "Revert "Revert "JIT root tables.""""