This reverts commit 82936d22. This commit creates issues when displaying network share names, and is reverted, so that we can find a better fix for the original issue #2722
mentioned in commit 4410fa94