Revert previously failed cherry-pick commit
Revert previously failed cherry-pick commit

chaincoin/chaincoin,chaincoin/chaincoin,chaincoin/chaincoin,chaincoin/chaincoin,chaincoin/chaincoin,chaincoin/chaincoin