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