Restore setting lost in the zamboni merge