Reverted last commit which breaks auto-connection