Revert "Aroma"

This reverts commit e13db8052a99a04971d14266d6cee09fb126f117.
Revert "Aroma"

This reverts commit cea59271938ca5b29f9ce63a6d428cbaa9717e64.