Replace inadvertently-removed deprecations
doh