diff --git a/src/search.c b/src/search.c
index df7067b..9a47ed4 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1477,12 +1477,8 @@
 	    }
 	}
 
-#ifdef FEAT_FKMAP	/* when in Farsi mode, reverse the character flow */
-	if (p_altkeymap && curwin->w_p_rl)
-	     lrFswap(searchstr,0);
-#endif
-
-	c = searchit(curwin, curbuf, &pos, NULL, dirc == '/' ? FORWARD : BACKWARD,
+	c = searchit(curwin, curbuf, &pos, NULL,
+					      dirc == '/' ? FORWARD : BACKWARD,
 		searchstr, count, spats[0].off.end + (options &
 		       (SEARCH_KEEP + SEARCH_PEEK + SEARCH_HIS
 			+ SEARCH_MSG + SEARCH_START
@@ -2976,10 +2972,6 @@
     int	    c;
 
     c = gchar_cursor();
-#ifdef FEAT_FKMAP	/* when 'akm' (Farsi mode), take care of Farsi blank */
-    if (p_altkeymap && c == F_BLANK)
-	return 0;
-#endif
     if (c == ' ' || c == '\t' || c == NUL)
 	return 0;
     if (enc_dbcs != 0 && c > 0xFF)