Revert "Connection lives there now"

This will come when fog-core ships

This reverts commit 22d236c25124024389652cc27a72fc28dd31e65b.