Patch Set 1: I would prefer that you didn't submit this

I have to add a test which proves that this one fixes history rendering. Up to know I was not able to produce such a test, but I am proposing this early to get feedback from those who have problems with history rendering.