This reverts commit 1592364d.

This apparantly causes some regressions so pull it out for now.
Signed-off-by: NDave Airlie <airlied@redhat.com>