Revert "[#1090] - see tikcet [#1737]"

This reverts commit 0fafc9144a04b69d73533b390175d52bbe9effc6.