Investigate fallout from transitioning to 77.0b1

Compilation is busted with our patches based on 77.0b1. This is the bug to investigate this.