This is a temporary fix while we determine if the color key workaround should be removed completely. See issue thread for discussion. Related to #1512. (cherry picked from commit c88ee1c9d3)
c88ee1c9d3