Let's solve this in bug 1178762 which is cloned from this bug. I'll copy there the relevant comments.