-

diff --git a/Makefile b/Makefile
index bf6db41..7aba373 100644
--- a/Makefile
+++ b/Makefile
@@ -31,11 +31,11 @@ SUBDIRS = \
 		src/NUnit \
 		tools/RuntimeService \
 		tools/javadoc-to-mdoc \
-		samples \
-		tests/bcl-test \
-		tests/codegen \
-		tests/locales \
-		tests/runtime
+#		samples \
+#		tests/bcl-test \
+#		tests/codegen \
+#		tests/locales \
+#		tests/runtime
 
 all:: $(TOP)/tools/scripts/etc/mono/4.0/machine.config
 	@if test -z $(ANDROID_SDK_PATH); then				\
diff --git a/README.md b/README.md
index 33cb849..d75cbf7 100644
--- a/README.md
+++ b/README.md
@@ -61,8 +61,8 @@ This section is used by `make reset-versions`
     $ git clone [email protected]:xamarin/monodroid.git
 
     $ git clone [email protected]:mono/mono.git
-    $ cd mono && git checkout -b master origin/master
-    $ cd mono && git reset --hard 8a0c516a7c69f48f20b9cfab3eaec20f7751a826
+    $ cd mono && git checkout -b kumpera-counters origin/kumpera-counters
+    $ cd mono && git reset --hard 5af67c7b946a6c4ccec6ed0e4d61883a4223c875
 
     $ git clone [email protected]:xamarin/android-api-docs.git
     $ cd android-api-docs && git checkout -b master origin/master
diff --git a/src/bindings/Makefile b/src/bindings/Makefile
index 47eab37..e77db98 100644
--- a/src/bindings/Makefile
+++ b/src/bindings/Makefile
@@ -18,7 +18,7 @@ MAPS_ASSEMBLIES = $(FRAMEWORKS:%=$(platforms_dir)/%/Mono.Android.GoogleMaps.dll)
 
 all:: $(COMPATIBILITY_V4_ASSEMBLIES)
 all:: $(COMPATIBILITY_V13_ASSEMBLIES)
-all:: $(MAPS_ASSEMBLIES)
+#all:: $(MAPS_ASSEMBLIES)
 
 PWD := $(shell pwd)
 
diff --git a/tools/RuntimeService/Makefile b/tools/RuntimeService/Makefile
index aa1a5a1..4b6bf24 100644
--- a/tools/RuntimeService/Makefile
+++ b/tools/RuntimeService/Makefile
@@ -99,7 +99,6 @@ $(PLATFORM_APKS): $(platforms_dir)/android-%/Mono.Android.Platform.apk: Makefile
 		$(wildcard $(frameworks_dir)/*/Mono.Android.Support.v4.dll) \
 		$(wildcard $(frameworks_dir)/*/Mono.Android.Support.v13.dll) \
 		$(wildcard $(frameworks_dir)/*/Mono.Android.Export.dll) \
-		$(wildcard $(frameworks_dir)/*/Mono.Android.GoogleMaps.dll) \
 		$(wildcard $(frameworks_dir)/*/OpenTK.dll) \
 		$(wildcard $(frameworks_dir)/*/OpenTK-1.0.dll)
 	$(RM) -R platforms/android-$*
@@ -113,7 +112,6 @@ $(PLATFORM_APKS): $(platforms_dir)/android-%/Mono.Android.Platform.apk: Makefile
 		$(frameworks_dir)/$$framework/OpenTK-1.0.dll* \
 		$(frameworks_dir)/$$framework/Mono.Android.Support*.dll* \
 		$(frameworks_dir)/$$framework/Mono.Android.Export.dll* \
-		$(frameworks_dir)/$$framework/Mono.Android.GoogleMaps.dll* \
 		platforms/android-$*/r/assemblies
 	$(Q) $(AAPT) package -f -0 .dll -0 .mdb -M platforms/android-$*/AndroidManifest.xml \
 		-I $(ANDROID_SDK_PATH)/platforms/android-8/android.jar \