diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb
index e1cef477c3..106ada82c7 100644
Binary files a/csharp/src/Google.Protobuf.Test/testprotos.pb and b/csharp/src/Google.Protobuf.Test/testprotos.pb differ
diff --git a/src/google/protobuf/generated_message_tctable_lite.cc b/src/google/protobuf/generated_message_tctable_lite.cc
index b6abc182d2..6227026588 100644
--- a/src/google/protobuf/generated_message_tctable_lite.cc
+++ b/src/google/protobuf/generated_message_tctable_lite.cc
@@ -773,21 +773,11 @@ inline FieldType ZigZagDecodeHelper(FieldType value) {
   return static_cast<FieldType>(value);
 }
 
-template <>
-inline uint32_t ZigZagDecodeHelper<uint32_t, true>(uint32_t value) {
-  return WireFormatLite::ZigZagDecode32(value);
-}
-
 template <>
 inline int32_t ZigZagDecodeHelper<int32_t, true>(int32_t value) {
   return WireFormatLite::ZigZagDecode32(value);
 }
 
-template <>
-inline uint64_t ZigZagDecodeHelper<uint64_t, true>(uint64_t value) {
-  return WireFormatLite::ZigZagDecode64(value);
-}
-
 template <>
 inline int64_t ZigZagDecodeHelper<int64_t, true>(int64_t value) {
   return WireFormatLite::ZigZagDecode64(value);