Comment # 3 on bug 1225868 from Dirk Stoecker

Ah. I considered only the first commit. Added the second now as well. Please
try again.