Revert accidentally merged changes from #953
Revert accidentally merged changes from #953

Issue #953 was accidentally merged into release/0.3.3 as part of #960
because #960 was based off of develop.

mark-in/securedrop-app-code,mark-in/securedrop-app-code,mark-in/securedrop-app-code,mark-in/securedrop-app-code