diff --git a/policy/modules/admin/firstboot.te b/policy/modules/admin/firstboot.te
index ade4fca7..e3bebae9 100644
--- a/policy/modules/admin/firstboot.te
+++ b/policy/modules/admin/firstboot.te
@@ -1,5 +1,5 @@
 
-policy_module(firstboot, 1.7.2)
+policy_module(firstboot, 1.7.3)
 
 gen_require(`
 	class passwd rootok;
@@ -120,17 +120,5 @@ optional_policy(`
 
 optional_policy(`
 	xserver_rw_xdm_xserver_shm(firstboot_t)
+	xserver_unconfined(firstboot_t)
 ')
-
-ifdef(`TODO',`
-allow firstboot_t proc_t:file write;
-
-ifdef(`printconf.te', `
-	can_exec(firstboot_t, printconf_t)
-')
-
-ifdef(`userhelper.te', `
-	role system_r types sysadm_userhelper_t;
-	domain_auto_trans(firstboot_t, userhelper_exec_t, sysadm_userhelper_t)
-')
-') dnl end TODO