The former isn't actually used anymore since KF6ColorScheme has been split out of it. (cherry picked from commit 6a0e447c)