Revert "Issue #2676266 by chris_hall_hu_cheng, Sam152, trevorkjorlien, benjy: There is no option for no markup" This reverts commit 2c714b17.