This fixes #8354.  I added the delete feature and made it work.