diff --git a/build.rs b/build.rs
index 6680f7aec..b745005c5 100644
--- a/build.rs
+++ b/build.rs
@@ -271,13 +271,6 @@ fn get_path(name: &str, default: &str, onvar: &Path) -> PathBuf {
     rsconf::set_env_value("DATADIR", datadir.to_str().unwrap());
     rsconf::rebuild_if_env_changed("DATADIR");
 
-    let datadir_subdir = if prefix_from_home {
-        "fish/install"
-    } else {
-        "fish"
-    };
-    rsconf::set_env_value("DATADIR_SUBDIR", datadir_subdir);
-
     let bindir = get_path("BINDIR", "bin/", &prefix);
     rsconf::set_env_value("BINDIR", bindir.to_str().unwrap());
     rsconf::rebuild_if_env_changed("BINDIR");
diff --git a/src/env/config_paths.rs b/src/env/config_paths.rs
index a1b055781..e84c430dc 100644
--- a/src/env/config_paths.rs
+++ b/src/env/config_paths.rs
@@ -122,7 +122,7 @@ fn new(argv0: &Path, exec_path: PathBuf) -> Self {
         // Fall back to what got compiled in.
         FLOG!(config, "Using compiled in paths:");
         ConfigPaths {
-            data: Some(PathBuf::from(env!("DATADIR")).join(env!("DATADIR_SUBDIR"))),
+            data: Some(PathBuf::from(env!("DATADIR")).join("fish")),
             sysconf: PathBuf::from(SYSCONF_DIR).join("fish"),
             doc: DOC_DIR.into(),
             bin: Some(PathBuf::from(env!("BINDIR"))),