UCB1AMAF: Reintroduce support for pre-Sylvain formula; sylvain_rave is still default