82ea1a7345
This is a very disappointing fix, as all it's doing is switching to another deprecated API, and kicking the can down the road, but if that's what upstream wants to do…