There were multiple problems discovered. This reverts commit 5c92e7a7. Conflicts: admin/cli/install.php