Fix crash on testnet; #81
Revert "Fix crash on testnet; #81"

This reverts commit ca210b445911aa66e7986882c0721f3083f3bb6b.