Chrome 29 Fix - Backport for 4.8