In prep for Fremantle support, removing autoconnect