Revert "Use custom zombie module"

This reverts commit 83066c728e53c63d4dbd9e86bb71811c0acf8082.