Clean up NETWORK_SESSION code after r191848