Remove colorization fixes (they don't work)

Change-Id: I46e53018bf7660cdda594261977c1f9f78c4da84