Revert "Merge branch 'content'"

This reverts commit 97e82d75473d40f8a864e5ae1329584408ea4373, reversing
changes made to 698cb857f4a18f943bf765f2c0f77f9692d2b305.