As discussed on irc, we'll remove the conditionnal about signle-factor.