Some callers assume that item_name is always set, so this may be considered an API break. This reverts commit 0c6203c97a.
0c6203c97a