Hi @yaph, thanks for the PR!

Could you keep the retro-compatibility by putting an `else if` statement (and keeping the removed lines)?

Thanks :cake: