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

We can still rebase at the end, before we merge, right?