Reverted preparation for current v8 trunk