Bug 980247 - Fix silly rebase error. r=fail