Bug 855236 - Fix JM issue. r=bhackett, a=bajaj