Revert "RowPermissions additional code review changes"

This reverts commit 37450195183d62589ecaa64fee8dbd39d9eed48e.