This reverts commit 928c2f0c.

This patch double applied, two checks for the price of one.
Signed-off-by: Dave Airlie <airlied@redhat.com>