mach-msm: vivo: Revert back to older ION setup