Merge pull request #10350 from mikeller/remove_matekh743