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

Remove internal use of deprecated methods.