Bug 839695: Remove deprecated Components usage left over from bug 732716.
Merge pull request #791 from Mossop/bug839695

Fix Bug 839695: Remove deprecated Components usage left over from bug 732716 r=@erikvold