Although I guess since this is a cherry-pick from an upstream PR linked to an upstream issue, there's a decent chance something like this will get in, so... approved