Reimplement --retro option to add legacy-AOM support
Fix tests