Revert "Revert "Remove privacy guard (2)""

This reverts commit ee6fd08c14f51e0d3492434bcb51cee55319c3b2.