Make sure the reference to the connector is removed (see #10333)

Changes from #703 now onto develop