diff --git a/VersionASM b/VersionASM
index 0a58d719a38b39944cd52e678d72af5704904752..3658dac6b81d495610da75a9fc325e1ff500759d 100644
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
                         GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.35"
 Module_Version          SETA    535
-Module_MinorVersion     SETS    "4.79.2.147.2.2"
-Module_Date             SETS    "14 May 2012"
-Module_ApplicationDate  SETS    "14-May-12"
+Module_MinorVersion     SETS    "4.79.2.147.2.3"
+Module_Date             SETS    "18 May 2012"
+Module_ApplicationDate  SETS    "18-May-12"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.35 (4.79.2.147.2.2)"
-Module_HelpVersion      SETS    "5.35 (14 May 2012) 4.79.2.147.2.2"
+Module_FullVersion      SETS    "5.35 (4.79.2.147.2.3)"
+Module_HelpVersion      SETS    "5.35 (18 May 2012) 4.79.2.147.2.3"
                         END
diff --git a/VersionNum b/VersionNum
index 564e8a7484ac77b13257cc24afc476f084523660..46c95e97be75c582ccad592d1ebe5cb69b618309 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
  *
  */
 #define Module_MajorVersion_CMHG        5.35
-#define Module_MinorVersion_CMHG        4.79.2.147.2.2
-#define Module_Date_CMHG                14 May 2012
+#define Module_MinorVersion_CMHG        4.79.2.147.2.3
+#define Module_Date_CMHG                18 May 2012
 
 #define Module_MajorVersion             "5.35"
 #define Module_Version                  535
-#define Module_MinorVersion             "4.79.2.147.2.2"
-#define Module_Date                     "14 May 2012"
+#define Module_MinorVersion             "4.79.2.147.2.3"
+#define Module_Date                     "18 May 2012"
 
-#define Module_ApplicationDate          "14-May-12"
+#define Module_ApplicationDate          "18-May-12"
 
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.35 (4.79.2.147.2.2)"
-#define Module_HelpVersion              "5.35 (14 May 2012) 4.79.2.147.2.2"
+#define Module_FullVersion              "5.35 (4.79.2.147.2.3)"
+#define Module_HelpVersion              "5.35 (18 May 2012) 4.79.2.147.2.3"
 #define Module_LibraryVersionInfo       "5:35"
diff --git a/s/HAL b/s/HAL
index 44b88e2103f47181c5f0859a658433be8f123670..df0eff7a7af299975badfc7764e4ae69e4f828e8 100644
--- a/s/HAL
+++ b/s/HAL
@@ -838,12 +838,6 @@ MMUon_nol1ptoverlap
         MOV     v3, #0                                  ; "MMU is on" signal
 
         BL      ARM_Analyse
-        ! 0, "FIXME: temporary code"
-;!!! STILL DON'T KNOW WHY THE BODGE IN ARM_ANALYSE ITSELF DOESN'T WORK!
-  MOV a1,#0
-  MOV a2,#32
-  STRB a2,[a1,#DCache_LineLen]
-  STRB a2,[a1,#ICache_LineLen]
 
         ChangedProcVecs a1