Uncommenting NotesCalendar stuff for R9.0.1 FP2