[Build] Going back to original $SolutionDir definition