That said, this type of thing seems a bit of a red-flag to add to core when we have to do this type of thing and upstream isn't interested in fixing it.