Issue 138

Should be tested with SCION.

Fixes https://github.com/jbeard4/SCION/issues/138
You should roll this back as we're punting on jbeard4/SCION#138, and jbeard4/SCION#151 doesn't require this change.