diff --git a/app/models/post.rb b/app/models/post.rb
index d14937e56dc..d9150d73818 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -20,7 +20,9 @@ class Post < ActiveRecord::Base
   self.permitted_create_params = Set.new
 
   # increase this number to force a system wide post rebake
-  BAKED_VERSION = 1
+  # Version 1, was the initial version
+  # Version 2 15-12-2017, introduces CommonMark and a huge number of onebox fixes
+  BAKED_VERSION = 2
 
   rate_limit
   rate_limit :limit_posts_per_day
@@ -472,6 +474,7 @@ class Post < ActiveRecord::Base
   def self.rebake_old(limit)
     problems = []
     Post.where('baked_version IS NULL OR baked_version < ?', BAKED_VERSION)
+      .order('id desc')
       .limit(limit).each do |p|
       begin
         p.rebake!
diff --git a/config/site_settings.yml b/config/site_settings.yml
index fc93ceb1947..af3d8beacd8 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1095,7 +1095,7 @@ developer:
   top_topics_formula_least_likes_per_post_multiplier:
     default: 3
   rebake_old_posts_count:
-    default: 250
+    default: 100
     min: 1
   migrate_to_new_scheme:
     hidden: true