rebase fix for chromium 30