backed out DataStoreSession stuff