diff --git a/sys/net/vnet.h b/sys/net/vnet.h
index b3a2a3442410..6c7b5021aca4 100644
--- a/sys/net/vnet.h
+++ b/sys/net/vnet.h
@@ -303,7 +303,7 @@ void	 vnet_data_free(void *start_arg, int size);
 	    descr)							\
 	SYSCTL_OID(parent, nbr, name,					\
 	    CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, 		\
-	    vnet_sysctl_handle_opaque, fmt, descr)
+	    sysctl_handle_opaque, fmt, descr)
 #define	SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr)	\
 	SYSCTL_OID(parent, nbr, name,					\
 	    CTLTYPE_STRING|CTLFLAG_VNET|(access),			\
diff --git a/sys/netinet/cc/cc_cdg.c b/sys/netinet/cc/cc_cdg.c
index 69335dbc12e4..3ebaacf7764e 100644
--- a/sys/netinet/cc/cc_cdg.c
+++ b/sys/netinet/cc/cc_cdg.c
@@ -81,11 +81,6 @@ __FBSDID("$FreeBSD$");
 
 #define	CAST_PTR_INT(X) (*((int*)(X)))
 
-#ifndef	VIMAGE
-#define	vnet_sysctl_handle_uint(oidp, arg1, arg2, req) \
-    sysctl_handle_int(oidp, arg1, arg2, req)
-#endif
-
 /* Private delay-gradient induced congestion control signal. */
 #define	CC_CDG_DELAY 0x01000000
 
@@ -357,7 +352,7 @@ cdg_beta_handler(SYSCTL_HANDLER_ARGS)
 	    (CAST_PTR_INT(req->newptr) == 0 || CAST_PTR_INT(req->newptr) > 100))
 		return (EINVAL);
 
-	return (vnet_sysctl_handle_uint(oidp, arg1, arg2, req));
+	return (sysctl_handle_int(oidp, arg1, arg2, req));
 }
 
 static int
@@ -367,7 +362,7 @@ cdg_exp_backoff_scale_handler(SYSCTL_HANDLER_ARGS)
 	if (req->newptr != NULL && CAST_PTR_INT(req->newptr) < 1)
 		return (EINVAL);
 
-	return (vnet_sysctl_handle_uint(oidp, arg1, arg2, req));
+	return (sysctl_handle_int(oidp, arg1, arg2, req));
 }
 
 static inline unsigned long
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 53e9b0409dcf..77e59bd5ea01 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -587,11 +587,7 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS)
 {
 	int error;
 
-#ifdef VIMAGE
-	error = vnet_sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
-#else
 	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
-#endif
 	if (error == 0) {
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_sendspace), SCTPCTL_MAXDGRAM_MIN, SCTPCTL_MAXDGRAM_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_recvspace), SCTPCTL_RECVSPACE_MIN, SCTPCTL_RECVSPACE_MAX);