Checked for existence of horizontal-scroll-bar-mode before applying fix for trunk.