MDL-18375 calendar: removed initial patch changes to core functions