Revert "Implemented by JiaLi"

This reverts commit be6199d539cc3fb18a754e894678f78e0e7b6801.