Revert "Vivo: Fix boot (?)"

This reverts commit cffb50018d0befc88a6ecac7e44b23622e29470b.