LPS-38700 Also fix in trunk to make sure our API is working fine, but we might want to start deprecating a whole lot for our Calendar stuff...