Major changes in 3.26.3.1: * Revert accidental backports of behavioral and visual changes