Further simplify test case from r186894