Cruise products - Just got off Fantasy on Saturday and it is lotion. Also didn't know that they don't provide shower gel in the cabins (and didn't bring any), so I asked our stateroom host to get me some, and he did. For the record, I liked the lotion.
Disney World products - They have changed the H20 products at the resorts as well. In January at OKW we still had the old blue H20 products, which included a lotion. Just stayed at OKW again the week before this cruise, and there is no more lotion in the rooms, and they have changed to a different formula in smaller bottles. Hated it - shampoo and shower gel are horrible!
We will go back to packing our own toiletries (this was first time we didn't) as Disney seems to be messing with their product line due to cost cutting measures, I'm sure.
Tiger