BugFix: Connectors not removing properly.
Authored by: arcachofo 2018-02-10
Parent: [r320]
Child: [r322]