Deprecation hotfix