Per Matt, fix use of FieldLabelProvider since it is not actually available to apps...