theymos fixed it already using Patch C, it only needed a second bump for him to take action.
Moreover, you might want to see what he said.
I didn't test it that much, but it seems to work without any side-effects AFAICT, so I added it
A level of trust, he added your patch without much scrutiny.