This reverts commit fc115c80b7. Tests are broken.
fc115c80b7
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>