Merge #10838: (finally) remove getinfo