This basically reverts !65 (merged), which proven to be too simple and just creating not needed noise in the monitoring.