revert alarm changes

Change-Id: I8575460b1b58a85545b888919df56268a072b259