... under the assumption the old implementation did ever work