This reverts commit 79cdf70
And merges in the following change from upstream
https://code.google.com/p/v8/source/detail?r=17641