[TASK] Adapted to Neos update

Sprint: 2013-30
Revert "[TASK] Adapted to Neos update"

This reverts commit 2e2597551a9306511a3ba2b5699f3f75723d9c42
[TASK] Adapted to Neos update

This reverts commit d4656447c645c2922ff9adb6b45cb9f43ea7ced0.