simplifying diff. Fixes #1227
Merge pull request #1302 from icambron/fix-dst-calendar

simplifying diff