Address ISLANDORA-1007

@mjordan give d1de2d2 a shot. Forgot about the actual link.