for -- this doesn't make a difference in my box (current, modular xorg) but Matthias Scheler reported problems on his and that this change helps
ae7deb01c5