Revert "refactoring removed limit"

This reverts commit d134ee6b20f44bc22f1a91c6bcdb660c5e6217d6.