Revert "The more better version"

This reverts commit 1d4aa113dfb866e6b4c145312e623193f12da193.