This reverts commit 7208f699. Still some failures on Intel, requires a slightly different solution. BUG=589851 Change-Id: I6ac6599249e9e0f6319c917e04734cd48ca9274d Reviewed-on: https://chromium-review.googlesource.com/329734Reviewed-by: Jamie Madill <jmadill@chromium.org>
