Revert "Fix flavors for stable/icehouse"

This reverts commit b5823a9ea74c2903fa03fe8075730944d19191c8.