https://github.com/dotnet/aspnetcore/pull/42646 has been merged and targets [.NET 8.0-rc1](https://github.com/dotnet/aspnetcore/milestone/244). Need to make sure we remove our implementation of the new flavor of HCs before we upgrade (around Oct-Nov).