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

This reverts commit c6e3f30c36f641173209f13730d34f4b381a7e74.