Revert "Vivo ION: Fix build"

This reverts commit 0423fdbf8c80fbd15fc2e3956913b1ee861f1770.