Could you please drop this? It looks unrelated to the scope of this PR.