Test workaround for xbuild problem