I just submitted the real fix for #10641.

This reverts commit 3120adc2.

Change-Id: I55051515f697e27ca887ed21c2ac985f0b9b062b
Reviewed-on: https://go-review.googlesource.com/9720Reviewed-by: Joel Sing <jsing@google.com>