Revert "fix a few things i didnt like"

This reverts commit 98124a0a120fd0b8355583a5b9138a42074f933c.
Revert "add support for recovery only on ville"

This reverts commit b8985f77a1759239cac1c4816c6a07ea9dda329e.