The comment is no longer true. This alos fixes a bunch of visual glitches. (cherry picked from commit 8111eedc)