Circling back here, this problem has subsided and I am no longer dealing with it on a regular basis, I presume somewhere upstream a bug was fixed that stopped this from happening. I will mark it closed and if anyone else is still dealing with it feel free to bump it.
Edit: it does not seem like I can close the bug myself, so if someone that can close bugs sees this please consider this issue resolved.