Revert "Revert "Giotto""

This reverts commit 125026f3237cf2780181e9251323c98e92e8b62e.