This MR is the initial part of a bunch of MRs to remove the Island Mode. First step: Include On Demand