Revert "Merge pull request #136 from tumblr/will-deploy-as-collins"

This reverts commit fe88f7a21cd923ce2ed5bab4fabf0f653af1c6d2, reversing
changes made to 699d0a600401d4883a09307477ac5b221dbbbfb8.