fixes https://github.com/certusone/wormhole/issues/486 Change-Id: I81b97ff0e1358bf0b88567ba9872ee615344a27c
Change-Id: Ia0c676c051deae20449a15b4556160a8d6e24386