[ros-diffs] [rharabien] 54476: - Partially revert r54475 to check if it fixes KVM