Make backwards compatible with ST2