Fix a regression from r211653.