More work on bug #8122.  It now correctly puts in the units.