Merge "Turn kvm-plugin back on"