This reverts commit 513479f624, reversing changes made to 01c36556bf. It breaks booting. Fixes #3376.
513479f624
01c36556bf