Revert "Merge pull request #2801 from guardian/303-preference-status"

This reverts commit 6e78a30085b13ca5d8d644650d358022ccfdfe65, reversing
changes made to 66c486200fc811108b1996bd69cf79314301a5f5.