This reverts commit aee1f800ad.
Reason for revert: The upstream issue: [1] was fixed in 1.0
Bazel release and gerrit switched to using Bazel 1.1 recently.
[1] https://github.com/bazelbuild/bazel/issues/9415
Change-Id: I6f81b187e0265ff797589479b7bff98a487c561a