Revert "TWRP-ify a bit more, see if anything happens"

This reverts commit f412f26442804e76b1d22a467ef4b618f143d8b1.