This reverts commit fc157218. I trusted the referred comment (and maybe misunderstood it), but the commit wasn't a good idea at all.