This fixes #8122.  It will now return on data point, with units.