Revert "Improve multiPV mode"