reverting changes to privacy API (to be integrated in dev branch