Index: common/BuildSettings.h
===================================================================
--- common/BuildSettings.h	(revision 17653)
+++ common/BuildSettings.h	(working copy)
@@ -321,11 +321,8 @@
 
 #endif
 
-#define MPT_TIME_UTC_ON_DISK 0
-#define MPT_TIME_UTC_ON_DISK_VERSION MPT_V("1.31.00.13")
 
 
-
 // fixing stuff up
 
 #if defined(MPT_BUILD_ANALYZED) || defined(MPT_BUILD_CHECKED) 
Index: common/versionNumber.h
===================================================================
--- common/versionNumber.h	(revision 17653)
+++ common/versionNumber.h	(working copy)
@@ -18,6 +18,6 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      31
 #define VER_MINOR      00
-#define VER_MINORMINOR 12
+#define VER_MINORMINOR 13
 
 OPENMPT_NAMESPACE_END
Index: soundlib/Load_it.cpp
===================================================================
--- soundlib/Load_it.cpp	(revision 17653)
+++ soundlib/Load_it.cpp	(working copy)
@@ -1278,19 +1278,11 @@
 	m_modFormat.type = (GetType() == MOD_TYPE_MPT) ? U_("mptm") : U_("it");
 	m_modFormat.madeWithTracker = std::move(madeWithTracker);
 	m_modFormat.charset = m_dwLastSavedWithVersion ? mpt::Charset::Windows1252 : mpt::Charset::CP437;
-#if MPT_TIME_UTC_ON_DISK
 #ifdef MODPLUG_TRACKER
-	m_modFormat.timezone = (m_dwLastSavedWithVersion && (m_dwLastSavedWithVersion >= MPT_TIME_UTC_ON_DISK_VERSION)) ? mpt::Date::LogicalTimezone::UTC : mpt::Date::LogicalTimezone::Local;
+	m_modFormat.timezone = (m_dwLastSavedWithVersion && (m_dwLastSavedWithVersion >= MPT_V("1.31.00.13"))) ? mpt::Date::LogicalTimezone::UTC : mpt::Date::LogicalTimezone::Local;
 #else
-	m_modFormat.timezone = (m_dwLastSavedWithVersion && (m_dwLastSavedWithVersion >= MPT_TIME_UTC_ON_DISK_VERSION)) ? mpt::Date::LogicalTimezone::UTC : mpt::Date::LogicalTimezone::Unspecified;
+	m_modFormat.timezone = (m_dwLastSavedWithVersion && (m_dwLastSavedWithVersion >= MPT_V("1.31.00.13"))) ? mpt::Date::LogicalTimezone::UTC : mpt::Date::LogicalTimezone::Unspecified;
 #endif
-#else
-#ifdef MODPLUG_TRACKER
-	m_modFormat.timezone = mpt::Date::LogicalTimezone::Local;
-#else
-	m_modFormat.timezone = mpt::Date::LogicalTimezone::Unspecified;
-#endif
-#endif
 
 	return true;
 }
Index: soundlib/Sndfile.cpp
===================================================================
--- soundlib/Sndfile.cpp	(revision 17653)
+++ soundlib/Sndfile.cpp	(working copy)
@@ -514,7 +514,6 @@
 		InitializeGlobals();
 		m_visitedRows.Initialize(true);
 		m_dwCreatedWithVersion = Version::Current();
-#if MPT_TIME_UTC_ON_DISK
 #ifdef MODPLUG_TRACKER
 		if(GetType() & MOD_TYPE_IT)
 		{
@@ -532,16 +531,8 @@
 			m_modFormat.timezone = mpt::Date::LogicalTimezone::Unspecified;
 		}
 #endif // MODPLUG_TRACKER
-#else
-#ifdef MODPLUG_TRACKER
-		m_modFormat.timezone = mpt::Date::LogicalTimezone::Local;
-#else // !MODPLUG_TRACKER
-		m_modFormat.timezone = mpt::Date::LogicalTimezone::Unspecified;
-#endif // MODPLUG_TRACKER
-#endif
 	}
 
-#if MPT_TIME_UTC_ON_DISK
 #ifdef MODPLUG_TRACKER
 	// convert timestamps to UTC
 	if(m_modFormat.timezone == mpt::Date::LogicalTimezone::Local)
@@ -556,7 +547,6 @@
 		m_modFormat.timezone = mpt::Date::LogicalTimezone::UTC;
 	}
 #endif // MODPLUG_TRACKER
-#endif
 
 	// Adjust channels
 	const auto muteFlag = GetChannelMuteFlag();