Follow-up to r88667; finish reverting bogus test cases from r87964. It looks like...