Revert "Dumb down code for Firefox & Chrome"

This reverts commit 8af9a61598482542d27c9bec8a8cbe67d80ba61e.