Rebase previous Blink fix

This PR replaces #2 as a rebased branch instead.

You should also see tonychacon#1 and of course schacon/kidgloves#2.

Though nothing compares to https://github.com/schacon/kidgloves/issues/1