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

This reverts commit 6129095fc0692cab6c7afb06552fc3b73e30b533.