Merge pull request #13103 from davidflanagan/bug923544

Bug 923544: remove unneeded workaround that was causing problems r=aus(cherry picked from commit 8db3fca246d8ba79a8bdd9998f5e12ed11533fea)

Conflicts:

	apps/settings/js/sound.js
Merge pull request #13235 from davidflanagan/bug923544-v1.2

Merge pull request #13103 from davidflanagan/bug923544