Revert "Revert "Remove privacy guard""

This reverts commit ef141fcfaac28f221aa8626a8295af33af4c7b1c.
Revert "Revert Remove Privacy Guard (2)"

This reverts commit 63561ea6c726b020f67236278b0340eb06ca38c3.