This reverts commit 1cf5481d.
This commit is based on 82936d22 which is being reverted for causing issues when displaying network share titles
