This makes it again as it was previously implemented by Vassil
in commit 92f1f502. Suggested by Enrico as easier to read.