Remove my own patch
Update to latest version from git