diff --git a/refpolicy/policy/modules/admin/firstboot.te b/refpolicy/policy/modules/admin/firstboot.te
index e6ed46c69..7de27d032 100644
--- a/refpolicy/policy/modules/admin/firstboot.te
+++ b/refpolicy/policy/modules/admin/firstboot.te
@@ -99,14 +99,13 @@ modutils_read_module_config(firstboot_t)
 modutils_read_module_deps(firstboot_t)
 
 # Add/remove user home directories
-userdom_filetrans_generic_user_home_dir(firstboot_t)
-userdom_manage_generic_user_home_dir(firstboot_t)
-userdom_filetrans_generic_user_home(firstboot_t,{ dir file lnk_file fifo_file sock_file })
 userdom_manage_generic_user_home_dirs(firstboot_t)
 userdom_manage_generic_user_home_files(firstboot_t)
 userdom_manage_generic_user_home_symlinks(firstboot_t)
 userdom_manage_generic_user_home_pipes(firstboot_t)
 userdom_manage_generic_user_home_sockets(firstboot_t)
+userdom_filetrans_generic_user_home_dir(firstboot_t)
+userdom_filetrans_generic_user_home(firstboot_t,{ dir file lnk_file fifo_file sock_file })
 
 ifdef(`targeted_policy',`
 	unconfined_domtrans(firstboot_t)
diff --git a/refpolicy/policy/modules/admin/usermanage.te b/refpolicy/policy/modules/admin/usermanage.te
index c1ae31fd8..3c3ade8e5 100644
--- a/refpolicy/policy/modules/admin/usermanage.te
+++ b/refpolicy/policy/modules/admin/usermanage.te
@@ -503,7 +503,7 @@ userdom_use_unpriv_users_fd(useradd_t)
 userdom_dontaudit_search_sysadm_home_dir(useradd_t)
 # Add/remove user home directories
 userdom_filetrans_generic_user_home_dir(useradd_t)
-userdom_manage_generic_user_home_dir(useradd_t)
+userdom_manage_generic_user_home_dirs(useradd_t)
 userdom_filetrans_generic_user_home(useradd_t,notdevfile_class_set)
 
 mta_manage_spool(useradd_t)
diff --git a/refpolicy/policy/modules/system/userdomain.if b/refpolicy/policy/modules/system/userdomain.if
index 9e86216a5..b66833ef0 100644
--- a/refpolicy/policy/modules/system/userdomain.if
+++ b/refpolicy/policy/modules/system/userdomain.if
@@ -3452,23 +3452,6 @@ interface(`userdom_search_generic_user_home_dir',`
 	allow $1 user_home_dir_t:dir search_dir_perms;
 ')
 
-########################################
-## <summary>
-##	Create, read, write, and delete
-##	generic user home directories.
-## </summary>
-## <param name="domain">
-##	Domain allowed access.
-## </param>
-#
-interface(`userdom_manage_generic_user_home_dir',`
-	gen_require(`
-		type user_home_dir_t;
-	')
-
-	allow $1 user_home_dir_t:dir create_dir_perms;
-')
-
 ########################################
 ## <summary>
 ##	Create objects in generic user home directories