TWRPY-ify

Change-Id: I0e6852ce607769e10220f9b87f74112df68fdb14