Backfilling updates from @mathiasbynens