Revert "Revert "Markup""

This reverts commit a5e4fdf2cb5bd400750b182950c926d44ee18406.