diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 1e9a249e6627..9a9e397d3e9c 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec_vnops.c,v 1.164 2016/09/08 00:07:48 pgoyette Exp $	*/
+/*	$NetBSD: spec_vnops.c,v 1.165 2016/09/08 08:45:52 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.164 2016/09/08 00:07:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.165 2016/09/08 08:45:52 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -482,16 +482,6 @@ spec_lookup(void *v)
 
 typedef int (*spec_ioctl_t)(dev_t, u_long, void *, int, struct lwp *);
 
-struct dev_to_mod {
-	const char *dev_name, *mod_name;
-};
-
-struct dev_to_mod dev_mod_table[] = {
-	{ "tap", "if_tap" },
-	{ "tun", "if_tun" },
-	{ NULL, NULL }
-};
-	
 /*
  * Open a special file.
  */
@@ -515,7 +505,6 @@ spec_open(void *v)
 	u_int gen;
 	const char *name;
 	struct partinfo pi;
-	struct dev_to_mod *conv;
 	
 	l = curlwp;
 	vp = ap->a_vp;
@@ -582,16 +571,6 @@ spec_open(void *v)
 			/* Get device name from devsw_conv array */
 			if ((name = cdevsw_getname(major(dev))) == NULL)
 				break;
-
-			/* Check exception table for alternate module name */
-			conv = dev_mod_table;
-			while (conv->dev_name != NULL) {
-				if (strcmp(conv->dev_name, name) == 0) {
-					name = conv->mod_name;
-					break;
-				}
-				conv++;
-			}
 			
 			/* Try to autoload device module */
 			(void) module_autoload(name, MODULE_CLASS_DRIVER);
@@ -644,16 +623,6 @@ spec_open(void *v)
 
 			VOP_UNLOCK(vp);
 
-			/* Check exception table for alternate module name */
-			conv = dev_mod_table;
-			while (conv->dev_name != NULL) {
-				if (strcmp(conv->dev_name, name) == 0) {
-					name = conv->mod_name;
-					break;
-				}
-				conv++;
-			}
-
                         /* Try to autoload device module */
 			(void) module_autoload(name, MODULE_CLASS_DRIVER);