Revert "Add Vincenzo's patch to root"

This reverts commit 86f82bd61194b560d779ae70b82d2a81868cc3ff.
Merge pull request #748 from ktf/revert-vincenzo

Revert Vincenzo's changes.