Not sure this change is related to this PR.