Revert "Merge remote-tracking branch 'origin/dev/issue-5980-islandora' into 0.x"

This reverts commit 53a283605d571d8dc8d756ded45657dfc279197d, reversing
changes made to f2725ea972ea77c6b4660b1a1790c5a3cc622d70.

Temporary fix until bugs introduced in this are fixed.  Note that to
merge this branch again, this commit must be reverted.