diff --git a/config.toml b/config.toml
index 3e38c35..dff3f29 100644
--- a/config.toml
+++ b/config.toml
@@ -113,7 +113,7 @@ vendor = true
 # would rather to perform a full bootstrap, compiling the compiler three times,
 # then you can set this option to true. You shouldn't ever need to set this
 # option to true.
-#full-bootstrap = false
+full-bootstrap = true
 
 # Enable a build of the extended rust tool set which is not only the compiler
 # but also tools such as Cargo. This will also produce "combined installers"
diff --git a/rust.spec b/rust.spec
index c69e97d..780dcf1 100644
--- a/rust.spec
+++ b/rust.spec
@@ -203,9 +203,6 @@ export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
 DESTDIR=%{buildroot} ./x.py install
 DESTDIR=%{buildroot} ./x.py install src
 
-# Fix any rpaths if needed
-chrpath -d %{buildroot}%{common_libdir}/lib*.so
-
 # Remove executable permission from HTML documentation
 # to prevent RPMLINT errors.
 chmod -R -x+X %{buildroot}%{_docdir}/%{name}/html
@@ -223,7 +220,6 @@ rm %{buildroot}%{rustlibdir}/manifest-rust*
 rm %{buildroot}%{rustlibdir}/install.log
 rm %{buildroot}%{rustlibdir}/uninstall.sh
 rm %{buildroot}%{rustlibdir}/rust-installer-version
-rm %{buildroot}%{common_libdir}/debug/.build-id
 
 # Remove installer artifacts (manifests, uninstall scripts, etc.)
 find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+'