Revert "Try a -takeUntil: when lifting instead of dealloc disposable"

This reverts commit eb0b0e5f9a452d3a4e786f6673d3cf0d3b05ebe5.