Back out bug 851046 because of rebase problems
Bug 804623 - Permission Prompt Helper needs more access context to enable/disable permissions. r=sicking