@average-vr-56795: so, middle ground: let's merge both of those, and we can loop back around to revert + rebuild protoc