I'd like it to be, yeah. This keeps it consistent with the current behavior but since we're looking to switch instances like this to 3 in a separate task it's probably worth just making part of that change here.