This reverts commit dd0c341b.
As it seems to be breaking the "git cl upload". Reverting the change
as per suggestion from original author.

BUG=891505

Change-Id: Ica3f9aaa78d33cee6935ffcff789417ce098905e
Reviewed-on: https://chromium-review.googlesource.com/c/1260043Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Mrunal Kapade <mrunal.kapade@intel.com>