bug #1933: Get the right system datastore