It seems reverting this exact commit also works around the problem. I have attached a patch against current head.
It seems reverting this exact commit also works around the problem. I have attached a patch against current head.