Removed obsolete AddBaseDir as code relying on it would behave wrong.