Revert "Account for another leak case"

This reverts commit 772a5cd0119672969cd0bb5a7a534bac11b07442.
Revert "Really fix #2269, remove circular reference."

This reverts commit 43544ca59e0c4d9868f8ee5ee52dff0508092938.