Revert "Merge branch 'blog2_branch_1'"

This reverts commit 5db91d93cee71917c4675412bd4dec29d3ff41fc, reversing
changes made to a922ad0f99b58d50b3a317e0a41d547852473c1f.