Revert "Opportunistic refactor of message handling in background.js"
b23bc6c
This reverts commit ce3230c.
