diff --git a/src/modules/Yp/module.pmod.in b/src/modules/Yp/module.pmod.in
index 5bb498f8a4d1be9a76bf5d02d98162c1ae12b2cc..b33c66d40bde7a3fc928db4ddb42e88b423110e1 100644
--- a/src/modules/Yp/module.pmod.in
+++ b/src/modules/Yp/module.pmod.in
@@ -1,5 +1,5 @@
 /*
- * $Id: module.pmod.in,v 1.7 1997/06/09 21:25:28 grubba Exp $
+ * $Id: module.pmod.in,v 1.8 1997/06/10 20:31:04 grubba Exp $
  *
  * YP (NIS) Functionality for Pike
  *
@@ -8,8 +8,6 @@
 
 inherit @module@;
 
-constant __Domain = Domain;	// Work-around for scope bug.
-
 // Usual nicknames
 constant nicknames = ([
   "passwd":"passwd.byname",
@@ -23,15 +21,15 @@ constant nicknames = ([
 ]);
 
 class Map {
-  object(__Domain) domain;
+  object(Domain) domain;
   string ypmap;
 
   void create(string map,string|void d)
   {
     if (d) {
-      domain = __Domain(d);
+      domain = Domain(d);
     } else {
-      domain = __Domain();
+      domain = Domain();
     }
     ypmap = map;
     array err;