Fix broken short_circuit/rewire for Issue #71
cc/ @bmoyles
Merge pull request #72 from Netflix/mtripoli-broken-short_circuit

Fix broken short_circuit/rewire for Issue #71

verified