These changes seem unrelated to the bug this patch is trying to address...