3f857cdef1
to prevent broken serialization caused by missing fields/methods. (Without this commit, the next commit will break tests.)