This reverts commit 9e85aa9c.

To be replaced with a better solution.

Reviewed-by: Adam Jackson <ajax@redhat.com>