diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index e993c77d3d97..b22bf17c02b1 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -38,11 +38,16 @@
       <version>1.3.0</version>
       <exclusions>
         <exclusion>
-          <artifactId>guava-jdk5</artifactId>
           <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-common-protos</artifactId>
+      <version>${generatedProto.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/pom.xml b/pom.xml
index ea0aa25f0654..327db8afc95d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,11 +466,6 @@
         <artifactId>grpc-protobuf</artifactId>
         <version>${grpc.version}</version>
       </dependency>
-      <dependency>
-          <groupId>io.grpc</groupId>
-          <artifactId>grpc-all</artifactId>
-          <version>${grpc.version}</version>
-      </dependency>
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>