This reverts #76179 and relands #73042 with an active timer check fix.
Co-authored-by: David Reveman <reveman@google.com>