It was sort of required already in previous commits, so remove a code branch that is not needed anymore. Followup of commit 1fdeff25.
