Update to latest upstream commit which includes fixes to allow it to work with recent ansible releases. Remove homegrown patch superseded by upstream commits.