Merge "Revert "Use codegen to catch LinkageErrors from plugins"" into main