diff --git a/src/fileformat.proto b/src/fileformat.proto
index 21e670a..89a56da 100644
--- a/src/fileformat.proto
+++ b/src/fileformat.proto
@@ -8,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 */
 
-option optimize_for = LITE_RUNTIME;
+//option optimize_for = LITE_RUNTIME;
 option java_package = "crosby.binary";
 package OSMPBF;
 
diff --git a/src/osmformat.proto b/src/osmformat.proto
index e59bab7..05425e8 100644
--- a/src/osmformat.proto
+++ b/src/osmformat.proto
@@ -8,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 */
 
-option optimize_for = LITE_RUNTIME;
+//option optimize_for = LITE_RUNTIME;
 option java_package = "crosby.binary";
 package OSMPBF;
 
diff --git a/tools/Makefile b/tools/Makefile
index 547906c..1c8f2da 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,7 +5,7 @@ CXX      ?= g++
 CXXFLAGS ?= -g
 
 CXXFLAGS += -I../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
-LDFLAGS  += -L../src -pthread -lz -lprotobuf-lite -losmpbf
+LDFLAGS  += -L../src -pthread -lz -lprotobuf -losmpbf
 
 .PHONY: clean install