connection: Downgrade a TODO