This patch fixes the issue for me, but I don't know what side effects might be. I have not run the test suite against this patch.
