Compatibility with latest Antioch
Restore compatibility with old Antioch

This should make it easier to hunt down any regressions in either.
Merge pull request #143 from grinsfem/nondefault_antioch

Compatibility with latest Antioch