Revert "Revert "Revert "Revert remove Privacy guard 1/2"""

This reverts commit b6cd8aaa528276214e6fbed141824821d47e9768.