I've pushed a fix to production though this is a real PITA to handle. I'm going to keep this report open and if anyone sees this occurring again please drop a reply. If I don't see any replies within a week, I'll close this bug report and mark it as fixed.