Revert 99b853f..102063a

This rolls back to commit 99b853f6b40fbaf9b7646f169deadf000a08a008.
Revert 2f8a9cd..c7f82a2

This rolls back to commit 2f8a9cde42f3d96ee4ab6c8469124144d8b5854d.
Fresh install and nothing more