Revert "Merge branch 'gian' into kris"

This reverts commit 2b5ad12702a51c415de13d6d9a7a8eff2fb65ef9, reversing
changes made to df25acc2eb7a5b8b3e53aba83c2f5d78dbc967b1.
Mergiato con esplosione