Revert "Merge pull request #279 from twitter/more-types-interval"

This reverts commit 1c49c62a5f85dd2235d8b03a804c5fb54fa79f05, reversing
changes made to 2701005e65f4c31c9570d28caa582520f669dab2.