* Revert "x/lock: Fix `ExtendLockup` API  (backport #1937) (#2030)"

This reverts commit bd32316c.

* Revert "Refactor `lock` method (backport #1936) (#2029)"

This reverts commit d733f648.

* Update changelog

* Update changelog