Comment 2 for bug 1138473

@vrruiz I did smoke tests & validated the FF part of the fix, could you quickly validate it also?