This reverts commit 8b26b6dd1e. This was causing problems with light mode 2 because some edge cases were no longer handled properly.
8b26b6dd1e