This reverts commit e186c0e4.

Change-Id: If3b84b87f7d4cb9aaa0945ff88b8986a5d9d1d4d
Reviewed-on: https://chromium-review.googlesource.com/192501Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>