Revert "05.09-TrifonZahariev"

This reverts commit 90ba5fc4766c295817e3d4bff4a4b2b5208dc7c8.
0509