Bug 839695: Remove deprecated Components usage left over from bug 732716