This reverts commit 0e5748f505. Temporariliy revert change till the CLA is signed by the contributor.
0e5748f505