Revert "Bug 49269: Echo markup adjustments"

This reverts commit 8ff2c4dec3eecf566066ef98df6cbe7ec0e3fbd2.

Change-Id: I3936c574854640c49689d42586fbddde6a9e45bb
Merge "Revert "Bug 49269: Echo markup adjustments""