diff --git a/utils_android.cc b/utils_android.cc
index a4f1ea8..bda7337 100644
--- a/utils_android.cc
+++ b/utils_android.cc
@@ -28,16 +28,11 @@
 // Open the appropriate fstab file and fallback to /fstab.device if
 // that's what's being used.
 static struct fstab* OpenFSTab() {
-  char propbuf[PROPERTY_VALUE_MAX];
-  struct fstab* fstab;
-
-  property_get("ro.hardware", propbuf, "");
-  string fstab_name = string("/fstab.") + propbuf;
-  fstab = fs_mgr_read_fstab(fstab_name.c_str());
+  struct fstab* fstab = fs_mgr_read_fstab_default();
   if (fstab != nullptr)
     return fstab;
 
-  fstab = fs_mgr_read_fstab("/fstab.device");
+  fstab = fs_mgr_read_fstab_with_dt("/fstab.device");
   return fstab;
 }