backport chrome fix to 4.5
Merge pull request #1698 from shackbarth/chrome-fix

backport chrome fix to 4.5