diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp
index 45e2628361..117c25b32f 100644
--- a/Source/Core/Core/CoreParameter.cpp
+++ b/Source/Core/Core/CoreParameter.cpp
@@ -180,7 +180,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
 				}
 				m_strName = pVolume->GetName();
 				m_strUniqueID = pVolume->GetUniqueID();
-				m_strRevisionSpecificUniqueID = pVolume->GetRevisionSpecificUniqueID();
+				m_revision = pVolume->GetRevision();
 
 				// Check if we have a Wii disc
 				bWii = pVolume.get()->IsWiiDisc();
@@ -407,6 +407,5 @@ void SCoreStartupParameter::LoadGameIni(IniFile* game_ini, const std::string& pa
 	game_ini->Load(path + GetUniqueID() + ".ini", true);
 
 	// INIs with specific revisions
-	if (!m_strRevisionSpecificUniqueID.empty())
-		game_ini->Load(path + m_strRevisionSpecificUniqueID + ".ini", true);
+	game_ini->Load(path + GetUniqueID() + StringFromFormat("r%d", m_revision) + ".ini", true);
 }
diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h
index e967b39026..2054794384 100644
--- a/Source/Core/Core/CoreParameter.h
+++ b/Source/Core/Core/CoreParameter.h
@@ -247,8 +247,8 @@ struct SCoreStartupParameter
 	std::string m_strDVDRoot;
 	std::string m_strApploader;
 	std::string m_strUniqueID;
-	std::string m_strRevisionSpecificUniqueID;
 	std::string m_strName;
+	int m_revision;
 
 	std::string m_perfDir;
 
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index 3cb115bf7a..4330bfc5de 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -28,7 +28,6 @@ public:
 		return std::unique_ptr<u8[]>();
 	}
 	virtual std::string GetUniqueID() const = 0;
-	virtual std::string GetRevisionSpecificUniqueID() const { return ""; }
 	virtual std::string GetMakerID() const = 0;
 	virtual int GetRevision() const { return 0; }
 	// TODO: eliminate?
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 984a82ce3b..7d09fc234e 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -56,11 +56,6 @@ std::string CVolumeGC::GetUniqueID() const
 	return ID;
 }
 
-std::string CVolumeGC::GetRevisionSpecificUniqueID() const
-{
-	return GetUniqueID() + StringFromFormat("r%d", GetRevision());
-}
-
 IVolume::ECountry CVolumeGC::GetCountry() const
 {
 	if (!m_pReader)
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index bc79e535c4..fef6a8ae69 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -25,7 +25,6 @@ public:
 	~CVolumeGC();
 	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
 	std::string GetUniqueID() const override;
-	std::string GetRevisionSpecificUniqueID() const override;
 	std::string GetMakerID() const override;
 	int GetRevision() const override;
 	std::vector<std::string> GetNames() const override;
diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp
index 02a6b1e3cc..af373efd68 100644
--- a/Source/Core/DolphinWX/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/ISOProperties.cpp
@@ -165,7 +165,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 
 	// Load game ini
 	std::string _iniFilename = OpenISO->GetUniqueID();
-	std::string _iniFilenameRevisionSpecific = OpenISO->GetRevisionSpecificUniqueID();
+	std::string _iniFilenameRevisionSpecific = _iniFilename + "r" + std::to_string(OpenISO->GetRevision());
 
 	if (!_iniFilename.length())
 	{
@@ -181,8 +181,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 	GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini";
 
 	GameIniDefault.Load(GameIniFileDefault);
-	if (_iniFilenameRevisionSpecific != "")
-		GameIniDefault.Load(GameIniFileDefaultRevisionSpecific, true);
+	GameIniDefault.Load(GameIniFileDefaultRevisionSpecific, true);
 	GameIniLocal.Load(GameIniFileLocal);
 
 	// Setup GUI