This actually fixes #7790.  There were a couple of things that I forgot to put in place so that it could actually be used.