Revert "Revert "Revert netd-legacy changes""

This reverts commit 1483a6499e4b85eadc06d2cd45c9b9fcc9e33598.