Revert "Merge site_install.." in favor of pull request.

This reverts commit ac68839497d34e437865fce2d6e3ede04892b980.