=== modified file 'functions/fsb_target_gentoo_flavor'
--- functions/fsb_target_gentoo_flavor	2017-10-12 23:21:40 +0000
+++ functions/fsb_target_gentoo_flavor	2015-06-19 16:54:27 +0000
@@ -11,7 +11,7 @@
 fsb_gentoo_profile_add flavor/$STAGE_GENTOO_FLAVOR
 # fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/circlebreak
 print '@profile' >>$build_dir/var/lib/portage/world_sets
-fsb_emerge_hackfix -uDN @world
+fsb_emerge -uDN @world
 # sed -i '/circlebreak/d' $build_dir/var/portage/local/profiles/custom/parent || die
 # fsb_emerge -uDN @world
 fsb_gentoo_post_update

=== modified file 'functions/fsb_target_gentoo_system'
--- functions/fsb_target_gentoo_system	2017-10-12 23:21:40 +0000
+++ functions/fsb_target_gentoo_system	2017-04-11 16:44:24 +0000
@@ -19,8 +19,8 @@
 else
 	fsb_emerge -u1 perl
 	fsb_chroot_bash perl-cleaner --all
-	fsb_emerge_hackfix -uDN @world
-	fsb_emerge_hackfix -uDN --with-bdeps=y @world
+	fsb_emerge -uDN @world
+	fsb_emerge -uDN --with-bdeps=y @world
 fi
 fsb_emerge -n gentoolkit
 sed -i '/circlebreak/d' $build_dir/var/portage/local/profiles/custom/parent || die