@Liliana Marie Prikler

> As a side note, pointing at commits and blaming them is not that nice :)

I didn't intend to point and blame. I included the commit mainly because it took me several days of bisecting to find and I wanted to spare this effort if anyone would decide to look for the same thing :).

I adjusted the patches according to your suggestions, please take another look.