This reverts commit 0969056f66. Reason for revert: Test failures with Luxmark, blender, and Indigobench. Need to investigate before re-applying Change-Id: I6b08273a8f9c8bcaa4e7a06cd42d15048e52ca2a
0969056f66