[Dev] Let's revert and move changes introduced by bugs #645 and #677 on Iceweasel

[Florian Pelz]

So libre is for free software and nonprism is for free software that
protects choice of whom to trust, both regardless of whether the trusted
party runs free software?

Is it a good idea to support free software in libre that does not
protect choice?

This seems relevant:
https://www.gnu.org/philosophy/who-does-that-server-really-serve.html