Issue #21504: Got rid of the extra list fetch