Revert "Updates for vold based recovery, thanks to pawitp"

This reverts commit 89642c0d5ab2a7a44bf8a968a8ac3cf799881a35.