Backed out of changeset 3575:ece3ee5472ef, makes CI hang for unknown reason.
Backed out of changeset 3575:ece3ee5472ef, makes CI hang for unknown reason.

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