Revert "And the final bit of VUFIND-1004." (not meant for 2.3)

This reverts commit 4044ed4bd16efff5dacd506f4bd2302f916ffca3.