Move static baking to the right place again