diff --git a/freemarker-core/src/main/resource-templates/freemarker/version.properties b/freemarker-core/src/main/resource-templates/freemarker/version.properties
index f7803f0..cecfdf7 100644
--- a/freemarker-core/src/main/resource-templates/freemarker/version.properties
+++ b/freemarker-core/src/main/resource-templates/freemarker/version.properties
@@ -26,11 +26,7 @@
 #   Qualifier :: = NightlyQualifier
 #                  |
 #                  ( ('pre'|'rc') twoDigitPositiveInteger ('-' NightlyQualifier)? )
-#   NightlyQualifier :: = 'nightly_[timestampInVersion]'
-# 
-# Note: In comments in this file we sourround timestampInVersion with 
-# square brackets instead of @@, to avoid replacement with a timestamp
-# during build which is required for reproducible builds.
+#   NightlyQualifier :: = 'nightly'
 # 
 # This format is compatible both with Maven and JSR 277, and it must
 # remain so. Stable versions must not have a qualifier.
@@ -41,11 +37,11 @@
 #   Version number        Means
 #   3.0.0                 3.0.0 stable release
 #   3.3.12                3.3.12 stable release
-#   3.3.13-nightly_[timestampInVersion]
+#   3.3.13-nightly
 #                         Modified version after 3.3.12, which will
 #                         become to 3.3.13 one day.
 #   3.4.0-pre03           The 3rd preview of version 3.4.0
-#   3.4.0-pre04-nightly_[timestampInVersion]
+#   3.4.0-pre04-nightly
 #                         Unreleased nightly version of the yet unfinished
 #                         3.4.0-pre04.
 #   3.4.0-rc01            1st release candidate of 3.4.0
@@ -60,9 +56,9 @@
 #   continue working without modification or recompilation.
 # - When the major version number is increased, major backward
 #   compatibility violations are allowed, but still should be avoided.
-version=2.3.33-nightly_@timestampInVersion@
+version=2.3.33-nightly
 # This exists as for Maven we use "-SNAPSHOT" for nightly releases,
-# and no _nightly_[timestampInVersion]. For final releases it's the
+# and no _nightly. For final releases it's the
 # same as "version".
 mavenVersion=2.3.33-SNAPSHOT
 
@@ -76,8 +72,8 @@
 #   2.4.0.stable
 #   2.4.0.rc01
 #   2.4.0.pre01
-#   2.4.0.nightly_[timestampInVersion]
-versionForOSGi=2.3.33.nightly_@timestampInVersion@
+#   2.4.0.nightly
+versionForOSGi=2.3.33.nightly
 
 # Version string that conforms to legacy MF
 # -----------------------------------------
@@ -98,11 +94,5 @@
 # 2.X-1.(99|98).Y. Note the X-1.
 versionForMf=2.3.32.97
 
-# The date of the build.
-# For reproducible builds we set it to a fixed date.
-# Although this is rather meaningless now
-# it is kept for backwards compatibility (tests and Version.java)
-# until decided to drop it completely
-buildTimestamp=1980-02-01T00:00:00Z
 
 isGAECompliant=true