Revert "Reproduce the issue on checking roles"

This reverts commit 208131c22f1b84294c0bc28f032d6b2faf16014b.