Had to fix the disposing hierarchy.
@madppiper solved this in this PR: https://github.com/sourcegraph/sourcegraph/pull/36298, just it was in conflict with the current main so I re-created his solution in the current PR.
It was also a good way to properly understand what he was doing. I think I gained a better understanding of the disposing hierarchy.
