Patches provided by Joel Baker in PR 22364, verified by myself.
from there anyway, so we can ignore changes in the NFS code...