Backport a hotfix patch from Blink upstream

See https://codereview.chromium.org/14598021/