HDFS-4685-WIP: revert protobuf change in preparation for applying real fix from HDFS-5739.
HDFS-4685-WIP: apply HDFS-5739 fix for protobuf