Per discussion, agreed that although it would have been ideal to do the decoupling in GATEWAY-3180 and its DS subtask, it also makes sense doing it in here as this ticket is not committable without the changes required to standard (i.e. will break existing functionality).