Revert "Fix for PigZombie"

This reverts commit 52fd2a8bd1bbfd84222ad0cabbda3e5dd6aa1944.