Backed out changeset 1123b4e86c96 - I souldn't code on little sleep :)
Backed out changeset 1123b4e86c96 - I souldn't code on little sleep :)

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