Chase the logic change to do the right thing when using the system dataset.