Revert remove Privacy guard 1/2