diff --git a/src/app/rpmostree-ex-builtin-unpack.c b/src/app/rpmostree-ex-builtin-unpack.c
index 132fec7194..3d27051ee9 100644
--- a/src/app/rpmostree-ex-builtin-unpack.c
+++ b/src/app/rpmostree-ex-builtin-unpack.c
@@ -95,8 +95,8 @@ rpmostree_ex_builtin_unpack (int             argc,
       glnx_autofd int rootfs_dfd = -1;
       if (!glnx_opendirat (AT_FDCWD, "/", TRUE, &rootfs_dfd, error))
         goto out;
-      if (!rpmostree_prepare_rootfs_get_sepolicy (rootfs_dfd, &sepolicy,
-                                                  cancellable, error))
+      sepolicy = ostree_sepolicy_new_at (rootfs_dfd, cancellable, error);
+      if (!sepolicy)
         goto out;
     }
 
diff --git a/src/libpriv/rpmostree-postprocess.c b/src/libpriv/rpmostree-postprocess.c
index 9f3a32bfe8..ecfb624d11 100644
--- a/src/libpriv/rpmostree-postprocess.c
+++ b/src/libpriv/rpmostree-postprocess.c
@@ -1857,11 +1857,11 @@ rpmostree_commit (int            rootfs_fd,
                   GCancellable  *cancellable,
                   GError       **error)
 {
-  /* hardcode targeted policy for now */
   g_autoptr(OstreeSePolicy) sepolicy = NULL;
   if (enable_selinux)
     {
-      if (!rpmostree_prepare_rootfs_get_sepolicy (rootfs_fd, &sepolicy, cancellable, error))
+      sepolicy = ostree_sepolicy_new_at (rootfs_fd, cancellable, error);
+      if (!sepolicy)
         return FALSE;
     }