Revert "TaPP: The actual Pac Pellets (3/4)"

This reverts commit 28b2b8148ff561d708a71c16dddfe2830b1dd20e.
TaPP: The actual Pac Pellets (3/4)

Change-Id: I68b17f9e8936bddc2f2f5c1852724bed3d162572