This reverts commit 55b41ff32ded37bb4730a6e13ff831c5def2841e.

Port e89e08ca

Reason for revert:
    Seems to be (mostly) responsible for the most recent Speedometer regression, not 100% sure.
    Let's see what the bots have to say.

R=bmeurer@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/1501763002

Cr-Commit-Position: refs/heads/master@{#32624}