rework pull after #5358 was merged