Bug 1066520 Fix bad merge caused by 0e090c9f14d4 r=bustage a=Ratty for CLOSED TREE