Dissolve calls on not-yet-activated entrypoints will block forever in the portal cleanup call without this commit. Issue #1778