Revert "All, except luma, when"

This reverts commit ac491140a9189d7fbde176e01fe13463adb1fbf5.