I always assumed this was the case and welcomed the change. Hotel personal hygiene products seem like a massively unnecessary waste. I want them there, but the large bottles are great.
Fun fact, I can attest to that hike being a pain / learning that the hard way. I once configured a ticket that had me only pay for the Toronto-Niagara leg of a NYP-TOR round trip, requiring me to cross the border of my own accord. I had a voucher that got me to Toronto, and then only enough...