net: fix merge derp.
net: fix merge derp 2