This reverts commit 92045e69. Broke a
unit test and made all tinderboxes red.
Requested-by: Stephan Bergmann <sbergman@redhat.com>