Revert "Rearranging lifetimes of objects"

This reverts commit 2be6d1ef37ca5a8e5828c5d17a53bc1580f4822e.