Merge "Revert "Use trampolines for calls to helpers""