This reverts commit b83d7f72.

Reason for revert: wrong branch

Change-Id: I28ebb121f7b3e331729e8a6a00961b876f3dd0f2
Reviewed-on: https://go-review.googlesource.com/93455Reviewed-by: Andrew Bonventre <andybons@golang.org>