Revert "Merge pull request #23527 from gaye/calendar-modularization-2-force-gaia-try"

This reverts commit 2991746d61bae865f6e0c0dfacda07ae3c2f2fbd, reversing
changes made to 21c2f4b81ef43cdb47e1c7703bb0266d6a17603a.