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

Please avoid rebasing commits in pull requests it destroys context.