Simplify testcase from r200797 some more.