Revert 2421a2d due to this is 2-0-stable branch.