Unsetting optional offset might still give a list.

Unsetting optional offset might still give a list. #26318