As the PR is changed, this part is not needed anymore...