This might cause analyze weirdness as shown in tryjobs here.

NOTRY=true

This reverts commit 5b74bd39.

Change-Id: I018925a55ce4cebbc873e8c0ebb4b97ae9ca1020
Reviewed-on: https://chromium-review.googlesource.com/323581Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Tested-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>