Restore compatibility with ST3