Stopped using the old calendar unit identifiers