This reverts commit e1425d95.

This is to keep the GPU fyi bots green until the chrome side is landed. Chrome will be rolling to e1425d95...

Change-Id: Iff1c60eeb7143fb72afa8525b31f8f0de9385897
Reviewed-on: https://chromium-review.googlesource.com/229497Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>