Restore non-testnet functions