Not happy about this change. I think we need to consider a more generic flag here, something not tied to mpipe