Revert "Move baking after chuser again"

This reverts commit 4408193a36181bed0c97fb46134fc59a39c071dc.