Yes, you're right. it's complicit.
However it's not related with this patch. It happens always at current source.
Next time it will fix it.

The kernel implementation is similar. You'll probably have to fix it there also.

cheers,

Fathi