Revert "Merge branch 'Content_011'"

This reverts commit 46cde9d209e22f3bf7428473cec0e16811bef965, reversing
changes made to 9165bdece1e135bc02a3e031614ab1b0b673b5e4.