the PR has been reverted in the 2.1 branch