Revert "Merge pull request #16746 from mcav/refactor-ringview"

This reverts commit 68744fbaaa188d0232f41b8b15f8737c7b660e23, reversing
changes made to 8b3c0f23c568ec9dfa06f4928bee19153a550334.