Revert "Merge branch 'lower-sampling-duration-15m' into 'master'" See merge request !111 Merged-by: Alex Ives <aives@gitlab.com>