Revert "This reapplies r207130 with an additional testcase+and a missing check for"
Typo in testcase.