Revert "Merge remote-tracking branch 'TranquilMarmot/whipit' into FrankenMod"

This reverts commit e081b67bdb123f1944b9d7a0892e33e850472797, reversing
changes made to 2c4f07078f0fcd0aca40cc24f8de414ccadde5b3.