diff --git a/mpd/base/media_info.proto b/mpd/base/media_info.proto
index 5ab1d21b4b..2cee10ee99 100644
--- a/mpd/base/media_info.proto
+++ b/mpd/base/media_info.proto
@@ -3,8 +3,6 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
-
 package dash_packager;
 
 message Range {
diff --git a/mpd/mpd.gyp b/mpd/mpd.gyp
index 210b33a42e..3e6f99b98c 100644
--- a/mpd/mpd.gyp
+++ b/mpd/mpd.gyp
@@ -19,6 +19,12 @@
         'proto_out_dir': 'mpd/base',
       },
       'includes': ['../build/protoc.gypi'],
+      'dependencies': [
+        # This target needs to depend on 'protobuf_full_do_not_use' to generate
+        # non-LITE (full) protobuf. We need full protobuf to serialize and
+        # deserialize human readable protobuf messages.
+        '../third_party/protobuf/protobuf.gyp:protobuf_full_do_not_use',
+      ],
     },
     {
       'target_name': 'mpd_builder',