Follow-up on #18823 and corresponding change https://go-review.googlesource.com/#/c/35970/ (see Rob's comment in that change).