This fixes #8242.  Everything works, including autocoloring.