Bug fixed upstream, so patch is no longer needed