Revert "Merge pull request #762 from themodernlife/develop"

This reverts commit a1bca1fbda1f251d7b23c2aa7f85e380f8641cd7, reversing
changes made to 4602940ff9b82d434f0144c7b990e75dca30f754.
Merge pull request #806 from twitter/jco/undo_762

Revert "Merge pull request #762 from themodernlife/develop"