Revert "TWRP-ify"

This reverts commit 60c6e7fe02d7abd7e0263e095794ae7937c2a5a2.