d5ebe48180
This reverts commit 74354dc4cf47af0d36d177366c57edb10acdd5b6. 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.