diff --git a/src/dll/fsop.c b/src/dll/fsop.c
index 7e4da7de..4e9d0469 100644
--- a/src/dll/fsop.c
+++ b/src/dll/fsop.c
@@ -1122,7 +1122,7 @@ FSP_API NTSTATUS FspFileSystemOpSetVolumeInformation(FSP_FILE_SYSTEM *FileSystem
 }
 
 static NTSTATUS FspFileSystemOpQueryDirectory_GetDirInfoByName(FSP_FILE_SYSTEM *FileSystem,
-    PVOID FileContext, PWSTR FileName, PWSTR Marker, BOOLEAN CaseSensitive,
+    PVOID FileContext, PWSTR FileName,
     PVOID Buffer, ULONG Length, PULONG PBytesTransferred)
 {
     NTSTATUS Result;
@@ -1132,28 +1132,17 @@ static NTSTATUS FspFileSystemOpQueryDirectory_GetDirInfoByName(FSP_FILE_SYSTEM *
         UINT8 B[sizeof(FSP_FSCTL_DIR_INFO) + 255 * sizeof(WCHAR)];
     } DirInfoBuf;
     FSP_FSCTL_DIR_INFO *DirInfo = &DirInfoBuf.V;
-    BOOLEAN HasMarker;
+
+    /* The FSD will never send us a Marker that we need to worry about! */
 
     memset(DirInfo, 0, sizeof *DirInfo);
-    HasMarker = 0 != Marker &&
-        0 == (CaseSensitive ? invariant_wcscmp : invariant_wcsicmp)(FileName, Marker);
-
-    if (!HasMarker)
+    Result = FileSystem->Interface->GetDirInfoByName(FileSystem, FileContext, FileName, DirInfo);
+    if (NT_SUCCESS(Result))
     {
-        Result = FileSystem->Interface->GetDirInfoByName(FileSystem,
-            FileContext, FileName, DirInfo);
-        if (NT_SUCCESS(Result))
-        {
-            if (FspFileSystemAddDirInfo(DirInfo, Buffer, Length, PBytesTransferred))
-                FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred);
-        }
-        else if (STATUS_OBJECT_NAME_NOT_FOUND == Result)
-        {
-            Result = STATUS_SUCCESS;
+        if (FspFileSystemAddDirInfo(DirInfo, Buffer, Length, PBytesTransferred))
             FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred);
-        }
     }
-    else
+    else if (STATUS_OBJECT_NAME_NOT_FOUND == Result)
     {
         Result = STATUS_SUCCESS;
         FspFileSystemAddDirInfo(0, Buffer, Length, PBytesTransferred);
@@ -1177,9 +1166,6 @@ FSP_API NTSTATUS FspFileSystemOpQueryDirectory(FSP_FILE_SYSTEM *FileSystem,
         Result = FspFileSystemOpQueryDirectory_GetDirInfoByName(FileSystem,
             (PVOID)ValOfFileContext(Request->Req.QueryDirectory),
             (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Pattern.Offset),
-            0 != Request->Req.QueryDirectory.Marker.Size ?
-                (PWSTR)(Request->Buffer + Request->Req.QueryDirectory.Marker.Offset) : 0,
-            Request->Req.QueryDirectory.CaseSensitive,
             (PVOID)Request->Req.QueryDirectory.Address,
             Request->Req.QueryDirectory.Length,
             &BytesTransferred);