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