Accidentally created two copies of this bug.  Merged them to avoid
confusion.