Merge pull request #1952 from reaperhulk/deprecation-dance

deprecation dance.