This reverts commit 800ea8ea96. Booting the system no longer worked after these changes.
800ea8ea96
unix