Partially revert TimeColumnDescriptor
refactor
#8685
Merged
TimeColumnDescriptor
refactor
#8685