Is this todo still valid since EZP-21324 is fixed ?