This reverts commit 16398894.
This broke TestUserTaskSpan test.

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