Revert "Merge remote branch 'horwitz/master'"
Revert "Merge remote branch 'horwitz/master'"

This reverts commit acd6831e31f54fa943d22b923fa1854180d45ccf, reversing
changes made to cb393e3188adf67e3c74794c05afe184891eb421.

stuartf/nakamura-ruby