Do the deprecation dance
4 files changed