Merge yhpark's bug fix

Supersedes https://github.com/square/wire/pull/18 due to intervening change.