We don't use grpc until 8.1. The grpc variants have caused code reverts in 7.0, remove them as they are unneeded. Do not plan on touching the code, just the variants to minimize impact.