I'm not fond of the changelog or comments as-is, but the attached fix looks sane-adjacent to me. Chang, any chance you'd want to dig in and make sure this is a real issue?