Revert backout of Mozilla's fix for bug 1724777

Once we have a proper fix for the bug that led us to back out Mozilla's patch for bug 1724777 we should revert our backout.