This patch works for me.