eb5df70929
This reverts commit 6bf7514adb.
Reason for revert: To fix ocltst issues.
Change-Id: Iac828e36e5288805be91f1b1efc7b95dda51b877