Fix decoding block headers and restoring timestamps on identity change.