Revert "Update alarm from 3.0"

This reverts commit e5c97dbf98f708843005d59a68f0510063a9e12d.