removed redundant handling of custom items, for #1730