Reverting some changes to maintain backwards compatibility for the project file.