Revert "ENYO-2978: code improvement"

This reverts commit bd7f55dfa027c5f40bac6a985687b9247f452ac4.
ENYO-2978: avoid special data case discradind