Adjust code to work with unpatched bitcoind