Revert connectivity for refactoring