This fixes #7744.  The indexes have been changed around.