This reverts commit db6152ad. This commit fails in ppc64. Since we want to backport it to 15.x. So revert it now to keep the patch complete.