Revert "Revert "New mentees blocks""

This reverts commit 6f1a924bec26d102d21dcbaa7c95a413acef583c.

This is fun because it reverts a revert.  Basically we still want these in the
staging environment, and I didn't cherry pick this change properly when I did
the initial pull request.  I'm learning too :-)