Maybe deconflict #3310 for real?

Hmm i kinda suck at this.
Merge from an upstream deconflict

This is probably a stupid way to do it; it'd be easier to rebase but
whatevs.