Align with pipebackend as per #1137 and #661
Remove unnecessary if block
Merge pull request #1160 from cmouse/remotebackend-pipe-connector-1137

Align with pipebackend as per #1137 and #661