Revert "Fixes to get bitcoind compiling"

This reverts commit b788ec493f8175349fd710ec8690ebdfd5df276d.