Temporary fix for master xen-api