arduino: Make the impact of the aforementioned bug fix smaller.