This fixes #7469.  It doesn't latch up anymore.