This was always too late; several fields related to it have been incorrectly
zero since the encoder was added.

(cherry picked from commit 314b421d)