Work around south issue #724.