Since the code that was too ugly to live is upstream, we can use it now,
instead of rolling our own.
Signed-off-by: Dave Airlie <airlied@redhat.com>