Revert "Fix build with new C2D color converter"

This reverts commit 62d88d9312cd2ef7b05643bd4a1c2294c34723c6.