Wait, how is that part of a routine fix PR and not a Real Scary Bugfix ? Paging @dotta