This reverts commit 3d53be2c5c. It depends on changes which are not available on the upstream version-1.4.0 branch. I will add this back after the 1.4.0 release.
3d53be2c5c