Merge "Revert "JIT root tables.""