Fix issue with going back to previous setup step
Fix issue with going back to previous setup step

(cherry picked from commit 518c761)

sampoyigi/TastyIgniter,sampoyigi/TastyIgniter,sampoyigi/TastyIgniter,tastyigniter/TastyIgniter,sampoyigi/TastyIgniter,tastyigniter/TastyIgniter