Revert "Temporarily revert timestamp serialization change to upgrade in phases"

This reverts commit c38479c6ae84b1663c9ea59c9efc4e0dd2a961c0.