Backed out changeset ddb60e3c3143  * Breaks Bridge - test_bridge fails on L71
Backed out changeset ddb60e3c3143
 * Breaks Bridge - test_bridge fails on L71

eriol/circuits,treemo/circuits,eriol/circuits,nizox/circuits,treemo/circuits,treemo/circuits,eriol/circuits