Yeah, I don't see why it would be broken, but it's clearly bisected to our upgrade commit