WIP: undo conditional format

Change-Id: I11db1e5824077135c4352ae43cc0e8d139244268