This reverts commit f561ca40.

Change-Id: Iecd3b9803930d89341ce6785daedf1a8925c3916
Reviewed-on: https://chromium-review.googlesource.com/193310Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>