Make sure this doesnt go away on xdaq branch