Revert "Merge Share into base-networking"

This reverts commit d9bb1dd6d7ec60d81f8d3bf455d5b76cca4ec8c1, reversing
changes made to 3efa9f3e143c2b3cf0fee9978b17e0440ca2f8bd.