Revert "Make privacy provider single user for multi-user environments"

This reverts commit 0158606bf772940d8b2e5c9843bb036be20f25c3.