Bug 962484 - Fix script XDR bug after bug 916612  r=luke