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