Revert "Merge branch 'content'"

This reverts commit 7a2ea81ce8d786db7627734d6e77d08ea0226748.