Revert temporary plain text output from I75e37906

Bug 44525 that required this change is fixed now,
reverting back to working version.

Bug: 43747
Change-Id: Ie142dc57359121866b603e65d0f7941cf1539d22
Merge "Revert temporary plain text output from I75e37906"