Revert "Merge code privacy"

This reverts commit bd218aaabd031b1d3e1fd8a6e22bc362a29df2ae, reversing
changes made to 5db22fff3ff2f38452fe4d2499c9aeef8dcf754f.