Remove alpha from contrast calc, see #1724