DEP: increase compatibility during deprecation period.