[ViX-distro] Reverse update, as it breaks builds (reverse-merged from commit 13559198179f81eb6ca413684a85d04bc49539ae)