Revert "Markup changes"

This reverts commit 42f8b254e4872faa6c4e2a14a1313b7bbf8f3208.