Revert Remove Privacy Guard (2)
Revert "Remove privacy guard"

This reverts commit f11f72cce5a79b4c8a8f7df5e7817913c7a2c8b6.