Revert "Issue 222"

Reverts jbeard4/SCION#289