--- src/afsd/afs.rc.linux.orig	2004-04-12 12:04:32.000000000 -0400
+++ src/afsd/afs.rc.linux	2004-11-05 15:59:42.179663496 -0500
@@ -88,27 +88,6 @@
     return 0
 }
 
-# If choose_client can't correctly determine which client to use, set
-# LIBAFS manually.
-choose_client() {
-
-	# Use the second field of the uname -v output instead of just
-	# doing a match on the whole thing to protect against matching
-	# a timezone named SMP -- I don't know of one, but let's be
-	# paranoid.
-
-	set X `uname -v`; shift
-	case $2 in
-	SMP) MP=.mp ;;	# MP system
-	*)   MP= ;;	# SP system
-	esac
-
-	# For now, just use uname -r to get the module version. 
-	VERSION=`uname -r`
-
-	LIBAFS=libafs-$VERSION$MP.o
-}
-
 #
 # Find prefix symbol to use with insmod.  We find the unregister_filesystem
 # string from /proc/ksyms since we know it's there.  If /proc/ksyms does not
@@ -163,27 +142,11 @@
 	esac
 }
 
-MODLOADDIR=/usr/vice/etc/modload
 # load_client loads the AFS client module if it's not already loaded. 
 load_client() {
-	# If LIBAFS is set, use it.
-	if [ -z "$LIBAFS" ] ; then
-		# Try to determine the right client.
-		choose_client
-	fi
-    
-	if [ ! -f "$MODLOADDIR/$LIBAFS" ] ; then
-		echo AFS module $MODLOADDIR/$LIBAFS does not exist. Not starting AFS.
-		exit 1
-	fi
-
-	if [ -f $KSYMS_FILE ]; then
-		# use the prefix command if required
-		set_prefix
-		/sbin/insmod ${PREFIX:+-P $PREFIX} -f -m $MODLOADDIR/$LIBAFS > $MODLOADDIR/libafs.map 2>&1
-	else
-		/sbin/insmod $MODLOADDIR/$LIBAFS > $MODLOADDIR/libafs.map 2>&1
-	fi
+	# Always returns true unless module NOT found
+	modprobe libafs
+	
 }
 
 generate_cacheinfo() {