Re-add Why are there so many MakeConnectComponents

Because apparently it got deleted before :-(