Revert "Delete some leftover variables"

This reverts commit 1e670eba6c1c0f0d619c745db8091dc61cdb815b.