Bug 828958 - minor fixup to keep patch same across branches r=bent, a=akeybl DONTBUILD