This reverts commit 4e20fa65.

Francesco Allertsen still has a broken configuration.
Signed-off-by: Dave Airlie <airlied@redhat.com>