Merge "Revert "Define some symlinks for workaround solutions""