Revert "Fix boot bug on evita.."

This reverts commit 437a90cd606cec33a60afe2f14ac66fcc355409c.