Revert "Changes made during installation"

This reverts commit c325c67fd8ababb2d692f354c9837432561d709a.