Merge "Revert "Shove type into source_info"" into main