Revert "Changes leftover from porting stuff from Bitcoin"

This reverts commit ae5456539f302968b66a2e8ca0f605ce6f4799b8.