Please move it to its previous location to avoid useless diffs in the PR