Fix issue #6552- "Renderring issue in Result panel after renaming a file in the project tree."

Fix issue #6552- "Renderring issue in Result panel after renaming a file in the project tree."

Revert pull request #6380 which fixed issue #5507 but caused issue #6552.