Tweaked bitcoind patch

git apply is happy with this.