This requires some in-flight patching of dependencies that have upstream issues tracking them. We should be able to drop the patching once upstream has releases.
