This fixes #7652.  It is now working properly again.