Revert "Merge pull request #1420 from jsantell/967295-fix-fennec-testaddons"

This reverts commit d7ef590b9ec9c03b24f4ec86f8e4bb98487dc9ff, reversing
changes made to b6b553e5defa5a2dd97db9f23fe79c7af15a4467.