Fix regression from r190016.

I don't have a reduced testcase yet.