Merge "Revert "Move Trace to use trampolines""