I agree. Since this is not actually making the problem worse and addresses the bug at hand, I'd like to land this PR as-is.