Just a note that this is *not* resolved upstream. We're at 5.16.2 now, and it still does that crap :((