Probably causing failures in the dEQP-GLES2 GL back-end tests:

dEQP-GLES2.functional.uniform_api.info_query.basic.sampler2D_both

BUG=angleproject:1123

This reverts commit 6fa156b6.

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