Fix a layering violation introduced in r177705.