Bug 1048598 removing an unnecessary else statement r=@jsantell