Revert some improvements for fix the old bug.