FIX: Remove COLOR_HACK
This got added from Color Control commit, as a result of a previous conflict on
 my kernel. Let's remove it.