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