Merge "Revert /proc/net related changes"