Revert delete Calendar

Change-Id: I927d18f97d4e39d2c1614d93d51ed2a28f9b0824