Temporary fix for export, until the relevant branch on SCiCustomer gets merged