This reverts commit ac741ab7.

Okay this looks like wasn't as fully baked as I'd led myself to believe.

Revert for now for further baking.
Signed-off-by: Dave Airlie <airlied@redhat.com>