This reverts commit 04aa943b. This broke the debian buildbot and I'm not sure why. Reverting so I can investigate.