backport chrome fix to 4.5