Pull in the fix for http://crbug.com/234342