Further simplify test case from r186119/r186035.