Revert "Squash commits for Privacy Guard"

This reverts commit 9a1c625b8a7bba6d63c31f6738ea80e7d772ae63.