TWRPY-ify

For real this time, this should take care of it.

Change-Id: Id11a96092b2664fcfd4005d2c888a33c7cdc58d4