Revert "Fixing colours on sane terminals..."

This reverts commit af6d453d8789fc4f53efb4c8b1bd776890277cbd.

Worked locally, bombed in jenkins...

Change-Id: Ia1669a4f994c899dccb7e5b085e3fca02801bebc
Merge "Revert "Fixing colours on sane terminals..."" into kk