@ade, I agree with estel and don_falcone that you should keep the behaviour as close as possible to stock. If you wish there could be an option for deleting one-time alarms, but it should be off by default. Just imagine what will happen on CSSU threads if replacement clock makes it in CSSU and the current behaviour is kept. AIUI it will be considered a critical bug (data loss ) .