Address ISLANDORA-1073 per @rosiel's recommended solution.