Revert "Fix a panic during boot introduced in r246245."

This reverts commit 3247ec7b92d50ca4e6b9e0f59ca58c58690e597e.
Add avg@'s fix for the panic introduced by r246245.