This reverts commit 74354dc4cf. I really shouldn't have modified this, especially not in this way. Was the wrong approach. The thing I was trying to fix was very rare as well.
74354dc4cf