This reverts commit 70a0e9c2.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>