Follow up to !76571 (merged), since it seems it runs smoothly for some time now.
FYI @jmasik @dshope @christos