SmallishBeans picked the latter of the two options, going for a water-free area that ends up feeling quite magical. While it isn't quite underwater, it definitely gives off an underwater ruin vibe.
Originally meant to be Walt Disney's apartment when he and his family visited, the Cinderella Castle Suite was never intended to be public. Sadly, Disney died before the suite was finished ...