Revert "Merge pull request #8598 from elfedefeu/846940-calendar-previous...

...dateV2"

This reverts commit 94634ca7eeb8f287b829c77942f0c1000bb628fa, reversing
changes made to 8894d2afac10aa7c67fc59ea14caad885ec31089.