Restore detection of AuxStore based on type Property

Restores original functionality of I/O layer removed by mistake in !61954 (merged)
Fixes DataModelTests failure (as discussed in !61986 (merged))