This reverts commit 42eebd7ade, reversing changes made to b169bfc9e2. This breaks nfs3.simple test and even current PR #97656 wouldn't fix it. Therefore let's revert for now to unblock the channels.
42eebd7ade
b169bfc9e2