Replace inadvertently-removed deprecations