Chrome 29 fix - Backport for 4.8.