Bug fixed upstream, patch no longer needed