Reverted fix for #22, blocked on https://code.google.com/p/chromium/issues/detail?id=257221