Bug 923544: remove unneeded workaround that was causing problems

Most of this PR just removes a workaround I had done for 914404. That bug doesn't reproduce anymore, and the workaround was apparently causing bug 923544, so this PR removes it.  

There are also two changes that fix the way we unload the notification sound so that we don't get an error in the console.