ISLANDORA-441 Previous revert unsuccessful (n00b); reverting back to 4ef9551.

This reverts commit db284877694bd9e44f7611448332e179d849b207, reversing
changes made to 4ef955174e4bca7c6f9c7445abcececf6ca11249.

Conflicts:
	islandora.module
ISLANDORA-441 Fix merge conflict.