diff --git a/reactos/drivers/filesystems/cdfs/cdfs.h b/reactos/drivers/filesystems/cdfs/cdfs.h
index cef813cc52b..84bd40f2b13 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.h
+++ b/reactos/drivers/filesystems/cdfs/cdfs.h
@@ -6,8 +6,6 @@
 #include <ntddcdrm.h>
 #include <ccros.h>
 
-#define USE_ROS_CC_AND_FS
-
 #define CDFS_BASIC_SECTOR 2048
 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16
 #define BLOCKSIZE CDFS_BASIC_SECTOR
diff --git a/reactos/drivers/filesystems/cdfs/cleanup.c b/reactos/drivers/filesystems/cdfs/cleanup.c
index d6162b10879..201412b3e91 100644
--- a/reactos/drivers/filesystems/cdfs/cleanup.c
+++ b/reactos/drivers/filesystems/cdfs/cleanup.c
@@ -51,11 +51,7 @@ CdfsCleanupFile(PDEVICE_EXTENSION DeviceExt,
   /* Uninitialize file cache if initialized for this file object. */
   if (FileObject->SectionObjectPointer && FileObject->SectionObjectPointer->SharedCacheMap)
     {
-#ifdef USE_ROS_CC_AND_FS
-      CcRosReleaseFileCache (FileObject);
-#else
       CcUninitializeCacheMap (FileObject, NULL, NULL);
-#endif
     }
 
   return STATUS_SUCCESS;
diff --git a/reactos/drivers/filesystems/cdfs/fcb.c b/reactos/drivers/filesystems/cdfs/fcb.c
index c56e52382fe..5436c0dfe59 100644
--- a/reactos/drivers/filesystems/cdfs/fcb.c
+++ b/reactos/drivers/filesystems/cdfs/fcb.c
@@ -241,22 +241,12 @@ CdfsFCBInitializeCache(PVCB Vcb,
   Fcb->FileObject = FileObject;
   Fcb->DevExt = Vcb;
 
-#ifdef USE_ROS_AND_FS
-  Status = CcRosInitializeFileCache(FileObject,
-                                    PAGE_SIZE);
-  if (!NT_SUCCESS(Status))
-    {
-      DbgPrint("CcRosInitializeFileCache failed\n");
-      KEBUGCHECK(0);
-    }
-#else
   Status = STATUS_SUCCESS;
   CcInitializeCacheMap(FileObject,
                        (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
                        FALSE,
                        NULL,
                        NULL);
-#endif
 
   ObDereferenceObject(FileObject);
   Fcb->Flags |= FCB_CACHE_INITIALIZED;
@@ -437,22 +427,11 @@ CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb,
 
   if (CdfsFCBIsDirectory(Fcb))
     {
-#ifdef USE_ROS_CC_AND_FS
-      NTSTATUS Status;
-      Status = CcRosInitializeFileCache(FileObject,
-                                        PAGE_SIZE);
-      if (!NT_SUCCESS(Status))
-        {
-          DbgPrint("CcRosInitializeFileCache failed\n");
-          KEBUGCHECK(0);
-        }
-#else
   CcInitializeCacheMap(FileObject,
                        (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
                        FALSE,
                        NULL,
                        NULL);
-#endif
       Fcb->Flags |= FCB_CACHE_INITIALIZED;
     }
 
diff --git a/reactos/drivers/filesystems/cdfs/fsctl.c b/reactos/drivers/filesystems/cdfs/fsctl.c
index 74b22cdf878..edc404d7cf5 100644
--- a/reactos/drivers/filesystems/cdfs/fsctl.c
+++ b/reactos/drivers/filesystems/cdfs/fsctl.c
@@ -398,21 +398,13 @@ CdfsMountVolume(PDEVICE_OBJECT DeviceObject,
 
   Fcb->Entry.ExtentLocationL = 0;
   Fcb->Entry.DataLengthL = (DeviceExt->CdInfo.VolumeSpaceSize + DeviceExt->CdInfo.VolumeOffset) * BLOCKSIZE;
-#ifdef USE_ROS_CC_AND_FS
-  Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject,
-				    PAGE_SIZE);
-  if (!NT_SUCCESS (Status))
-    {
-      DbgPrint("CcRosInitializeFileCache failed\n");
-      goto ByeBye;
-    }
-#else
+
   CcInitializeCacheMap(DeviceExt->StreamFileObject,
                        (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
 		       TRUE,
 		       NULL,
 		       NULL);
-#endif
+
   ExInitializeResourceLite(&DeviceExt->VcbResource);
   ExInitializeResourceLite(&DeviceExt->DirResource);
 
diff --git a/reactos/ntoskrnl/cc/fs.c b/reactos/ntoskrnl/cc/fs.c
index 77d6bc42252..a0e7c1c1ab4 100644
--- a/reactos/ntoskrnl/cc/fs.c
+++ b/reactos/ntoskrnl/cc/fs.c
@@ -87,7 +87,12 @@ CcInitializeCacheMap (
 	IN	PVOID				LazyWriterContext
 	)
 {
-    CcRosInitializeFileCache(FileObject, VACB_MAPPING_GRANULARITY);
+    ASSERT(FileObject);
+    ASSERT(FileSizes);
+
+    /* Call old ROS cache init function */
+    CcRosInitializeFileCache(FileObject,
+        PAGE_SIZE/*VACB_MAPPING_GRANULARITY*/);
 }
 
 /*