Better workaround for xbuild bug #14295