install: Partial revert of 6ef60235f10a4caeac2038844fe9e1489d9aaf7d