Work on bug #7979.
This fixes #7979.  It now actually pushed up.