[VER] Revert part of 9da502ad90c

 * Causes regression in previously working code
[VER] Reverted part of 93eff750