xxx hack for testing non split builds