No bug - Fix botched merge of bug 940907. r=bustage-fix