Temporarily revert timestamp serialization change to upgrade in phases