MDL-18375 calendar: removed initial changes to core functions