Remove patch that was comitted upstream in bzr rev 4806