Revert "Merge branch 'master' into browserify"

This reverts commit 58812ae8f105c98392c687d0e51efd050bebd59c, reversing
changes made to 5a38908fb54f2ad7dff837810e89e9f6a614cdbf.