Revert "Privacy Guard [2/4]"

This reverts commit 7475a43350048993c0750ef0e1f20194b8828a94.

Change-Id: Id4b5d9fb5612c5e63f2636a3bece5af9946fcdbf