Revert "More fixes for https://webarchive.jira.com/browse/ARI-3985"

This reverts commit 6129095fc0692cab6c7afb06552fc3b73e30b533.
Merge branch 'ari-3985' into ait-qa
Merge branch 'ait-qa' of github.com:internetarchive/wayback into ait-qa