Revert "Add missing stuffs in "Add permissions management framework" implementation"

This reverts commit 61cac49e303cf293414cded5fd3151f37ec96cfd.