undo the undo of the interval fixes
Merge pull request #283 from twitter/interval-fix

undo the undo of the interval fixes