In #15900 I committed the wrong change. Instead of deleting the
(functionally) duplicate tests, I copied the original onto the duplicate
to see the diff, then never came back and actually deleted it. Doing so
here.