This reverts commit 12b6c181.

Reason for revert: Broke vet builder. #19322 was not fully fixed.

Change-Id: Id85131d4d0b8915480d65e3532da62b769463d70
Reviewed-on: https://go-review.googlesource.com/37625Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>