Merge "Revert^2 "Workaround Clang hangs indefinitely"" into main