Update PR 5363: only disable if Dim or Black, see PR for details.