Revert to Root_on_create per datastore

This reverts commit 7d72f86aa6cbb5d4853fb190d6dfe621be04e09d.