Revert netd-legacy changes