Re #1113 legacy mode