Restore compatibility with old Antioch

This should make it easier to hunt down any regressions in either.