IIRC, the initial deal was reached before Eisner came on board. He tried to break the agreement but relented under the threat of a lawsuit. Disney did get some concessions from Tischman in the process.
The two hotels are covered under a 99 year lease so they won't be going back to Disney anytime soon. And really I don't see why they would be interested. If anything, Disney is expanding this sort of outsourcing in recent years. Similar agreements exist for Shades of Green, the Downtown Disney area hotels, many DTD shops and restaurants and even some theme park restaurants. These deals can be pretty lucrative for Disney as they provide a steady revenue stream while avoiding many of the day-to-day operational headaches.