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