Merge "Revert "rustc-1.78.0 Build 11910258"" into main