ISLANDORA-441 Mistakes in last commit (n00b); reverting back to 4ef9551.

This reverts commit db284877694bd9e44f7611448332e179d849b207, reversing
changes made to 824f0ebb4d4ceb8b6d23c634e86c7aa54289fe5f.