I wish this was done in a separate bug (that's probably already filed :) -> bug 971486).
We have a lot of pressure on this bug so we should keep changed to a minimum