This change looks unrelated to the scope of this PR. Could you please revert it?