EZP-21315: removed todo