Merge "Bring back the sensing alarm.  We need it!"