Reimplement privacy mode

FIXED!!!!!!!!!!!!!!!!!!!!!!!!!!!!

This reverts commit aecfac04934fc0b3b4ccda3dbd0e18d110522853

Change-Id: I2f58c6822e4e3fb12ca327ccf4e1d216f56a49f9