Revert "My own grouper and mako dependencies"

This reverts commit f4d8909dc01a0e32fea71ec3521224d133782d49.