Revert: add permission manager

Change-Id: I902118a60f4c2c1199bcf9dff208fa5b9dc5278d