Revert "Revert "Ingredient Notes special case.""

This reverts commit a48112caa26714711d412dbacbfd0e75f9a04e15.
Revert "Revert "Revert "Ingredient Notes special case."""

This reverts commit fb23e4e3b03ac85a75a95bf2a4ba938f29a163be.