Bug 1023664 - Calendar modularization 2

lets keep the old style because it exposes a constructor!