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