Rollback change to create_new_unit selector.