This reverts commit 84188296 AKA CL 60530.

Fixes #21783

Change-Id: I68038a77de7446dea68419a40dd25982ea6d7df5
Reviewed-on: https://go-review.googlesource.com/62151Reviewed-by: Heschi Kreinick <heschi@google.com>