Bug 944595 - Remove fakeperm

cherry-pick from master