Don't try to assign to None, remove now hopefully unnecessary workaround