Revert "Topology update"

This reverts commit 28542849d795b67697c89ad44c33fa8d9a228530.