Fixes: #18862 (closed) Topic-rename: server-normalize-paths
This will create a new commit in order to revert the existing changes.
