Revert "More MultiUser support to PA features"

This reverts commit 34522cbfb76e271961f279d8ca677a965d146e22.