Revert "Pieces changes made by Fernando"

This reverts commit da0f55962f5c51a48a28b2a156b4e4231a013b8c.