Take care of ISLANDORA-1091 - h/t @dmoses

Heh. I guess it doesn't need to be there.

I'll rebase, and push.