Revert "Merge remote-tracking branch 'refs/remotes/Islandora/7.x-release' into 7.x"

This reverts commit 3f1a750ab43cc1cd8eab2b6d12610ead17e8b34e, reversing
changes made to 57bbc349ba5e7ec1c403068cbf6c4721bc2481b5.