Missing changes from "Fix destruction observer."