Revert "Moved bootstrap variables"

This reverts commit 81e5f02495de459437331dc95a013572d0da504b.