Revert "Revert remove Privacy guard 1/2"

This reverts commit fe852ef1d425283aa34e254cda90dde8e573e3f2.