Remove auto-unassigning