Revert "Revert "Remove privacy guard""

This reverts commit 94ecd340a1b5d28e9e543e4c4167d5acb0ac8f84.