Is this change needed for this PR?