Revert "Merge branch '3678-serve-stale-servfailing-unexpectedly-v9_16' into 'v9_16'"
This reverts commit b2a4447a, reversing changes made to 8924f929.
It also removes release note 6038, since the fix is reverted.
There was a concern that the original fix might introduce new issues. Since we're close to a release, it was decided on the team meeting to revert the changes until we have more time to evaluate that it works as intended.
Reverts !7167 (merged)
Reopens #3678 (closed)