Revert unneeded changes introduced as a side-effect AuxPoW.
Merge pull request #585 from rnicoll/1.8-dev-cleaning

Revert unneeded changes introduced as a side-effect AuxPoW.