Squashed commit of the following:
commit 8b18f78098953c5aba744dd16a215b6ed4cd5143
Author: Luke Morris <lukevmorris@gmail.com>
Date: Wed Feb 28 20:44:46 2018 -0800
Revert "Merge pull request #2663 from influxdata/feature/migrate-time-interval"
This reverts commit 935186984c, reversing
changes made to e5b8889bc6.
commit 8f17059d24cc1a1bb4b8675be70fb9adb3f3a3e3
Author: Luke Morris <lukevmorris@gmail.com>
Date: Wed Feb 28 20:44:23 2018 -0800
Revert "Merge pull request #2890 from influxdata/fix/time-interval"
This reverts commit bb01a569ca, reversing
changes made to 3609bc7d3a.