This reverts commit 86e472317c8fd9309b76c32ca55fcdeaf63f853b. It breaks Debian buildbot, for some reason.