Revert "Liaz's salad changes"

This reverts commit 42c05781ef4c7555e12124b999a7e466295e1c4e.