Revert "Come back to the original version"

This reverts commit e192097b095c2c6e54b1d1eec2e7009532832c1a.