More work on #1281: reset idle rate counter