a PR named "cleanup and coding style" shouldn't contain a fix for a Beta blocker</rant>

Anyway, if this fixes the bug then I wonder how it could ever have worked?