This is working for me.  Got the latest from upstream and applied...