Merge "Revert^2 "Compile link-time thunks in codegen.""