diff --git a/WORKSPACE b/WORKSPACE
index 3c309f7f1..d7499d8d5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -6,9 +6,9 @@ domain_registry_repositories()
 
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "8c8a0f7f1327178bc8654e658cb6fff1171936e3033c5e263d513a7901a75b31",
-    strip_prefix = "rules_closure-0.2.5",
-    url = "http://bazel-mirror.storage.googleapis.com/github.com/bazelbuild/rules_closure/archive/0.2.5.tar.gz",
+    sha256 = "7d75688c63ac09a55ca092a76c12f8d1e9ee8e7a890f3be6594a4e7d714f0e8a",
+    strip_prefix = "rules_closure-b8841276e73ca677c139802f1168aaad9791dec0",
+    url = "http://bazel-mirror.storage.googleapis.com/github.com/bazelbuild/rules_closure/archive/b8841276e73ca677c139802f1168aaad9791dec0.tar.gz",  # 2016-10-02
 )
 
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
@@ -20,5 +20,4 @@ closure_repositories(
     omit_json = True,
     omit_jsr305 = True,
     omit_jsr330_inject = True,
-    omit_protobuf_java = True,
 )
diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl
index ad306c285..eeb162d64 100644
--- a/java/google/registry/repositories.bzl
+++ b/java/google/registry/repositories.bzl
@@ -431,12 +431,6 @@ def domain_registry_repositories():
       sha1 = "79a8984096fc6591c1e3690e07d41be506356fa5",
   )
 
-  native.maven_jar(
-      name = "protobuf_java",
-      artifact = "com.google.protobuf:protobuf-java:3.0.0-beta-3",
-      sha1 = "ed8c2f9a63cfa770292f8173fd0172bdaa014fe3",
-  )
-
   native.maven_jar(
       name = "qdox",
       artifact = "com.thoughtworks.qdox:qdox:1.12.1",
diff --git a/javascript/template/soy/BUILD b/javascript/template/soy/BUILD
index 34f0258ab..bcc5e24f6 100644
--- a/javascript/template/soy/BUILD
+++ b/javascript/template/soy/BUILD
@@ -2,5 +2,5 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "soy_usegoog_js_files",
-    srcs = ["@soyutils_usegoog//file"],
+    srcs = ["@io_bazel_rules_closure//closure/templates:soy_jssrc"],
 )
diff --git a/javatests/google/registry/ui/js/registrar/contact_settings_test.js b/javatests/google/registry/ui/js/registrar/contact_settings_test.js
index 546168a80..1a2c762f5 100644
--- a/javatests/google/registry/ui/js/registrar/contact_settings_test.js
+++ b/javatests/google/registry/ui/js/registrar/contact_settings_test.js
@@ -286,6 +286,7 @@ function testDelete() {
 
 /**
  * @param {string=} opt_email
+ * @return {Object}
  */
 function createTestContact(opt_email) {
   var nameMail = opt_email || 'test@example.com';
@@ -304,6 +305,7 @@ function createTestContact(opt_email) {
 /**
  * Convert parsed formContact to simulated wire form.
  * @param {!Element} contact
+ * @return {Object}
  */
 function simulateJsonForContact(contact) {
   contact.visibleInWhoisAsAdmin = contact.visibleInWhoisAsAdmin == 'true';
diff --git a/javatests/google/registry/ui/js/registrar/whois_settings_test.js b/javatests/google/registry/ui/js/registrar/whois_settings_test.js
index 3532808c5..cd3a6f49a 100644
--- a/javatests/google/registry/ui/js/registrar/whois_settings_test.js
+++ b/javatests/google/registry/ui/js/registrar/whois_settings_test.js
@@ -66,7 +66,10 @@ function tearDown() {
 }
 
 
-/** Creates a test registrar. */
+/**
+ * Creates test registrar.
+ * @return {Object}
+ */
 function createTestRegistrar() {
   return {
     emailAddress: 'test2.ui@example.com',