Bustage fix for bug 1060976, irc-r=efaust, landed on a CLOSED TREE