Tony Murray 7fe895bd08 Revert "Refactor datastores to classes (#9179)" (#11273)
This reverts commit e5dad7a64e74a207a0dc01293aa69a366f44d055.
2020-03-11 07:52:52 -05:00
..