This cleans up legacy/trac#21596: now that circuit_established is reliable, it can be used during descriptor creation as well. This prevents a regression to bugs like legacy/trac#21594.