Partially back out r367492 due to problematicr367492 would unlock the socket buffer before eventually calling the upcall.
This leads to problematic interaction with NFS kernel server/client components
(MP threads) accessing the socket buffer with potentially not correctly updated
components not handling errors in a timelystate.
fashion.