Backport -doDisposed: