Version 3.29.88.1 (merged r24221)

Revert part of r24098

BUG=chromium:417508
LOG=N
R=machenbach@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/trunk@24223 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Merge remote-tracking branch 'upstream/trunk' into trunk