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

(cherry picked from commit 9435a70b752ac4f9448a7fce3d9e453ce3a8df65)