Bug 939534 - Follow-up to the follow-up to address review comments to address orange that caused (mark tests fuzzy). r=me