diff --git a/CHANGELOG.md b/CHANGELOG.md
index d77d85d..d48c317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,6 @@
 
 - Add new `--no-ignore-parent` flag, see #787 (@will459)
 
-- Add new `-N, --no-strip` flag, see #760 (@jcaplan)
-
 ## Bugfixes
 
 - Set default path separator to `/` in MSYS, see #537 and #730 (@aswild)
diff --git a/src/app.rs b/src/app.rs
index f8556b6..b26593b 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -615,17 +615,6 @@ pub fn build_app() -> App<'static, 'static> {
                          argument. Changes the usage to `fd [FLAGS/OPTIONS] --search-path <path> \
                          --search-path <path2> [<pattern>]`",
                 ),
-        )
-        .arg(
-            Arg::with_name("no-strip")
-                .long("no-strip")
-                .short("N")
-                .conflicts_with_all(&["absolute-path", "list-details"])
-                .help("Show all non-absolute paths with './' prefix")
-                .long_help(
-                    "Show all non-absolute paths with './' prefix. This flag only affects \
-                         the output when no search path is provided.")
-
         );
 
     if cfg!(unix) {
diff --git a/src/main.rs b/src/main.rs
index a23bc90..47e68bd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -375,8 +375,8 @@ fn construct_config(matches: clap::ArgMatches, pattern_regex: &str) -> Result<Co
                     None
                 }
             }),
-        no_strip: matches.is_present("no-strip"),
-    })
+        no_strip: matches.is_present("path") || matches.is_present("search-path"),
+        })
 }
 
 fn extract_command(
diff --git a/tests/tests.rs b/tests/tests.rs
index 7a054af..80a0d01 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -1907,7 +1907,7 @@ fn test_error_if_hidden_not_set_and_pattern_starts_with_dot() {
 fn test_no_strip() {
     let te = TestEnv::new(DEFAULT_DIRS, DEFAULT_FILES);
     te.assert_output(
-        &["--no-strip"],
+        &[".", "."],
         "./a.foo
         ./e1 e2
         ./one
@@ -1922,19 +1922,17 @@ fn test_no_strip() {
     );
 
     te.assert_output(
-        &["--no-strip", "foo", "./one"],
-        "./one/b.foo
+        &["--search-path=."],
+        "./a.foo
+        ./e1 e2
+        ./one
+        ./one/b.foo
+        ./one/two
         ./one/two/c.foo
         ./one/two/C.Foo2
+        ./one/two/three
         ./one/two/three/d.foo
-        ./one/two/three/directory_foo",
-    );
-    te.assert_output(
-        &["--no-strip", "foo", "one"],
-        "one/b.foo
-        one/two/c.foo
-        one/two/C.Foo2
-        one/two/three/d.foo
-        one/two/three/directory_foo",
+        ./one/two/three/directory_foo
+        ./symlink",
     );
 }