Second attempt to cherry-pick Timer0 remove commit from branch master.