Revert "Merge branch 'master' into browserify"

This reverts commit 013adc61c852561810994d899692d63b65176c6c, reversing
changes made to 8aca4cb5b1a8012aa23ba05386d10cb59b3b4817.