This reverts commit fd1e39cad891282e4343be4d5e80125d7954b347. I don't see how this cosmetic change can actually affect anything, but tinderbox #27 seems to claim one of the unittests fails because of this one single commits, so let's see.