Revert the auto-network->starttls code.