Revert "Merge branch 'installation-tweaks'"

This reverts commit 21c49cd044a829f81099fd4a9d19bd81ff41fcd8, reversing
changes made to ee77d0c9b0df6ba19d6e142cde49943009e22674.
Revert "Merge remote-tracking branch 'github/master'"

This reverts commit ee77d0c9b0df6ba19d6e142cde49943009e22674, reversing
changes made to 25cbfb822266a88e9d0c217ff3cc4420289db92f.
Revert "Merge branch 'no-paver'"

This reverts commit 25cbfb822266a88e9d0c217ff3cc4420289db92f, reversing
changes made to 704cc0af04aa1150a3c8fd25d71f73934c5fc9bd.