This fixes #7367.
Work on bug #7364.  I got the API working.