diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp
index a0ae5da77..0e216965f 100644
--- a/src/Nibbler.cpp
+++ b/src/Nibbler.cpp
@@ -485,61 +485,6 @@ bool Nibbler::getLiteral (const std::string& literal)
   return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getUUID (std::string& result)
-{
-  auto i = _cursor;
-
-  if (i < _length &&
-      _length - i >= 36)
-  {
-    // 88888888-4444-4444-4444-cccccccccccc
-    if (isxdigit ((*_input)[i + 0]) &&
-        isxdigit ((*_input)[i + 1]) &&
-        isxdigit ((*_input)[i + 2]) &&
-        isxdigit ((*_input)[i + 3]) &&
-        isxdigit ((*_input)[i + 4]) &&
-        isxdigit ((*_input)[i + 5]) &&
-        isxdigit ((*_input)[i + 6]) &&
-        isxdigit ((*_input)[i + 7]) &&
-        (*_input)[i + 8] == '-'     &&
-        isxdigit ((*_input)[i + 9]) &&
-        isxdigit ((*_input)[i + 10]) &&
-        isxdigit ((*_input)[i + 11]) &&
-        isxdigit ((*_input)[i + 12]) &&
-        (*_input)[i + 13] == '-'     &&
-        isxdigit ((*_input)[i + 14]) &&
-        isxdigit ((*_input)[i + 15]) &&
-        isxdigit ((*_input)[i + 16]) &&
-        isxdigit ((*_input)[i + 17]) &&
-        (*_input)[i + 18] == '-'     &&
-        isxdigit ((*_input)[i + 19]) &&
-        isxdigit ((*_input)[i + 20]) &&
-        isxdigit ((*_input)[i + 21]) &&
-        isxdigit ((*_input)[i + 22]) &&
-        (*_input)[i + 23] == '-'     &&
-        isxdigit ((*_input)[i + 24]) &&
-        isxdigit ((*_input)[i + 25]) &&
-        isxdigit ((*_input)[i + 26]) &&
-        isxdigit ((*_input)[i + 27]) &&
-        isxdigit ((*_input)[i + 28]) &&
-        isxdigit ((*_input)[i + 29]) &&
-        isxdigit ((*_input)[i + 30]) &&
-        isxdigit ((*_input)[i + 31]) &&
-        isxdigit ((*_input)[i + 32]) &&
-        isxdigit ((*_input)[i + 33]) &&
-        isxdigit ((*_input)[i + 34]) &&
-        isxdigit ((*_input)[i + 35]))
-    {
-      result = _input->substr (_cursor, 36);
-      _cursor = i + 36;
-      return true;
-    }
-  }
-
-  return false;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 bool Nibbler::getPartialUUID (std::string& result)
 {
diff --git a/src/Nibbler.h b/src/Nibbler.h
index a0c5855a1..a08ea1f80 100644
--- a/src/Nibbler.h
+++ b/src/Nibbler.h
@@ -60,7 +60,6 @@ public:
   bool getNumber (std::string&);
   bool getNumber (double&);
   bool getLiteral (const std::string&);
-  bool getUUID (std::string&);
   bool getPartialUUID (std::string&);
   bool getOneOf (const std::vector <std::string>&, std::string&);
   bool getName (std::string&);
diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp
index 47be01fcd..71c1196b3 100644
--- a/test/nibbler.t.cpp
+++ b/test/nibbler.t.cpp
@@ -35,7 +35,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (315);
+  UnitTest t (306);
 
   // Ensure environment has no influence.
   unsetenv ("TASKDATA");
@@ -286,21 +286,6 @@ int main (int, char**)
     t.ok    (n.getLiteral ("bar"),    "     'bar' :     getLiteral ('bar')  -> true");
     t.ok    (n.depleted (),           "        '' :       depleted ()       -> true");
 
-    // bool getUUID (std::string&);
-    t.diag ("Nibbler::getUUID");
-    n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d5");
-    t.ok (n.getUUID (s),                             "uuid 1 found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d5", "uuid 1 -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
-    n = Nibbler ("00000000-0000-0000-0000-000000000000,a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d5");
-    t.ok (n.getUUID (s),                             "uuid 1 found");
-    t.is (s, "00000000-0000-0000-0000-000000000000", "uuid 1 -> correct");
-    t.ok (n.skip (','),                              "comma -> skipped");
-    t.ok (n.getUUID (s),                             "uuid 2 -> found");
-    t.is (s, "a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d5", "uuid 2 -> correct");
-    t.ok (n.depleted (),                             "depleted");
-
     // bool getPartialUUID (std::string&);
     t.diag ("Nibbler::getPartialUUID");
     n = Nibbler ("a0b1c2d3-e4f5-A6B7-C8D9-E0F1a2b3c4d5");