The thermohaline circulation of the ocean results primarily from downwelling at sites in the Nordic and Labrador Seas and upwelling throughout the rest of the ocean. The latter is often described as being due to breaking internal waves. Here we reconcile the difference between theoretical and observed estimates of vertical mixing in the deep ocean by presenting a revised view of the thermohaline circulation, which allows for additional upwelling in the Southern Ocean and the separation of the North Atlantic Deep Water cell from the Antarctic Bottom Water cell. The changes also mean that much less wind and tidal energy needs to be dissipated in the deep ocean than was originally thought.