Revert "Merge branch 'master' of ../firefox-plugins"

This reverts commit 9da20eb8c77c93022c60d7291eaf712feb112202, reversing
changes made to 3a49ff2520f8d99876c0b029604ddb69accea3f9.