fix boot errors

This reverts commit ad4460b2df1e26c75e84f38000116c30dea7ee1c.