Revert "Merge remote-tracking branch 'sputnik/mbs-5388-new' into beta" (MBS-5881)

This reverts commit a1c3047d19c9ff2987f3ee83fd9c9c54267c095d, reversing
changes made to e2063bae5047dffff11356b855fc10bb89920163.