Partial revert of c20309419e for better screen colors