Revert "listy, maile, grunt"

This reverts commit 2720cb568da9bf6d690424436fe7af12d1a89255.