(util) Reverted some changes that crept in from the `avr` branch