Revert "Connectivity: change method signatures"

This reverts commit 73bc12af3318e38d935166db298c09c5cd4d5ec7.