Revert "Oopsie fix."

This reverts commit dad72d820ce1e41c62eb95b7de115f8b0f2cd1ec.
Revert "DE2851: Completed fix, with UTs and AT.  However, had to wip AT, as for some reason searchApiTests fail locally, even though the procedure works manually."

This reverts commit f06e5b1a6e246503f9cfd0a3b3a564ad3f34f127.