Remove internal use of deprecated methods.
Merge pull request #3475 from bakercp/deprecation-fix

Remove internal use of deprecated methods.