I accidentally got the 3 files I was asked to revert part of the merge.
This reverts them.

Bug: angleproject:1695

Change-Id: I93a85776e890d0d35a5ff24973860006836c736f
Reviewed-on: https://chromium-review.googlesource.com/884105Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Luc Ferron <lucferron@google.com>