Experimental change to put subsampling inside descriptor.