This fixes #8150.  Everything is now set properly.