Issue #2186689: Fixed deletion via entity_delete().