Revert !20: Use after free + commited binary

This reverts merge request !20 (merged)

Both of changes seems to be wrong:

• The change in code creates a use-after-free error for lost packages;
• The binary file should not be commited