This reverts commit 1a107901.

This commit caused a NULL-ptr deference bug and must be
reverted for now.
Signed-off-by: NJoerg Roedel <jroedel@suse.de>