Fix unnamed sockets

[1] broke the CI by not considering unnamed sockets. This reverts the previous change and refactors the work to handle both cases.

[1] !2 (merged)