move stuff from the model to the provider (bug 944799)
Merge pull request #1509 from andymckay/944799

move stuff from the model to the provider (bug 944799)