Comment 8 for bug 1253804

Reverting 836 is not trivial as 2 other commits are touching the same code since then.